fix: sale master

app/Http/Controllers/SalesController.php

@@ -12,6 +12,8 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Database\QueryException;
 use App\Http\Requests\Sales\StoreSaleRequest;
 use App\Http\Requests\Sales\UpdateSaleRequest;
+use App\Models\Company;
+use App\Services\SaleService;
 use Barryvdh\DomPDF\Facade\Pdf;
 
 class SalesController extends Controller
@@ -42,7 +44,7 @@ class SalesController extends Controller
                         "phone" => $sale->customer->phone,
                         "email" => $sale->customer->email,
                         "price" => HelperService::rupiahFormat(
-                            $sale->saleDetail->sum("price")
+                            SaleService::totalPrice($sale)
                         ),
                         "status" => $sale->status,
                     ]
@@ -74,7 +76,7 @@ class SalesController extends Controller
                         fn($stockProduct) => [
                             "number" => $stockProduct->product_number,
                             "name" => $stockProduct->product->name,
-                            "price" => $stockProduct->price,
+                            "price" => $stockProduct->getRawOriginal("price"),
                             "ppn" => $stockProduct->ppn,
                             "qty" => $stockProduct->qty,
                             "unit" => $stockProduct->product->unit,
@@ -202,14 +204,26 @@ class SalesController extends Controller
 
     public function invoice(Sale $sale)
     {
-        $pdf = Pdf::loadView("PDF.Sales.Invoice", compact("sale"));
+        $ppn = Ppn::first()->ppn;
+
+        $company = Company::first();
+
+        $pdf = Pdf::loadView(
+            "PDF.Sales.Invoice",
+            compact("sale", "company", "ppn")
+        );
+
         return $pdf->stream();
     }
 
     public function deliveryOrder(Sale $sale)
     {
-        $pdf = Pdf::loadView("PDF.Sales.Do", compact("sale"));
+        $company = Company::first();
+
+        $pdf = Pdf::loadView("PDF.Sales.Do", compact("sale", "company"));
+
         $pdf->setPaper("a3", "landscape");
+
         return $pdf->stream();
     }
 }

app/Models/Sale.php

@@ -13,6 +13,8 @@ class Sale extends Model
 
     protected $fillable = ["number", "ppn", "status", "customer_id", "user_id"];
 
+    protected $with = ["saleDetail.product", "customer"];
+
     protected function updatedAt(): Attribute
     {
         return Attribute::make(

app/Models/SaleDetail.php

@@ -20,8 +20,8 @@ class SaleDetail extends Model
                 $ppn = Ppn::first()->ppn;
 
                 return $this->sale->ppn
-                    ? HelperService::ppn($value, $ppn) * $this->qty
-                    : $value * $this->qty;
+                    ? HelperService::ppn($value, $ppn)
+                    : $value;
             }
         );
     }

app/Services/SaleService.php

@@ -10,12 +10,8 @@ class SaleService
 {
     public static function totalPrice(Sale $sale)
     {
-        return $sale->saleDetail->sum(function ($saleDetail) use ($sale) {
-            $ppn = Ppn::first()->ppn;
-
-            return $sale->ppn
-                ? HelperService::ppn($saleDetail->price, $ppn)
-                : $saleDetail->price;
+        return $sale->saleDetail->sum(function ($saleDetail) {
+            return $saleDetail->price * $saleDetail->qty;
         });
     }
 }

resources/views/PDF/Purchases/Do.blade.php

@@ -158,9 +158,9 @@
                 </tr>
             </thead>
             <tbody style="text-align: center;">
-                @foreach ($purchase->purchaseDetail as $purchaseDetail)
+                @foreach ($purchase->purchaseDetail as $key => $purchaseDetail)
                     <tr>
-                        <td style="border-left: 1px solid black;">1</td>
+                        <td style="border-left: 1px solid black;">{{ $key + 1 }}</td>
                         <td style="border-left: 1px solid black; text-align: left;">
                             {{ $purchaseDetail->product->name }}</td>
                         <td style="border-left: 1px solid black;">{{ $purchaseDetail->qty }}</td>

resources/views/PDF/Purchases/Invoice.blade.php

@@ -153,9 +153,9 @@
                 </tr>
             </thead>
             <tbody style="text-align: center;">
-                @foreach ($purchase->purchaseDetail as $purchaseDetail)
+                @foreach ($purchase->purchaseDetail as $key => $purchaseDetail)
                     <tr>
-                        <th>1</th>
+                        <th>{{ $key + 1 }}</th>
                         <td style="text-align: left;">{{ $purchaseDetail->product->name }}</td>
                         <td>{{ $purchaseDetail->qty }}</td>
                         <td>UNIT</td>
@@ -193,8 +193,8 @@
             </tfoot>
         </table>
 
-        <p style="margin: 0; font-size: x-small; font-weight: bold; text-align: right;">Semua produk dikenapan ppn
-            sebebar
+        <p style="margin: 0; font-size: x-small; font-weight: bold; text-align: right;">Semua produk dikenakan ppn
+            sebesar
             {{ $purchase->ppn ? $ppn : 0 }} %
         </p>
 

resources/views/PDF/Sales/Do.blade.php

@@ -72,10 +72,10 @@
                             <td style="padding: 0;">
                                 <table style="border-spacing: 0;">
                                     <tr>
-                                        <td>XXXXXXXXXXXX</td>
+                                        <td>{{ $sale->customer->name }}</td>
                                     </tr>
                                     <tr>
-                                        <td>XXXXXXXXXXXX</td>
+                                        <td>{{ $sale->customer->address }}</td>
                                     </tr>
                                 </table>
                             </td>
@@ -97,7 +97,7 @@
                             <td style="padding: 0">
                                 <table style="border-spacing: 0">
                                     <tr>
-                                        <td>XXXXXXXXXXXX</td>
+                                        <td>{{ $sale->customer->phone }}</td>
                                     </tr>
                                 </table>
                             </td>
@@ -117,12 +117,12 @@
                                     <tr>
                                         <td>DATE</td>
                                         <td>:</td>
-                                        <td>XXXXXXXXXXXX</td>
+                                        <td>{{ $sale->updated_at }}</td>
                                     </tr>
                                     <tr>
                                         <td>PO NO</td>
                                         <td>:</td>
-                                        <td>XXXXXXXXXXXX</td>
+                                        <td>{{ $sale->number }}</td>
                                     </tr>
                                     <tr>
                                         <td>TTB NO</td>
@@ -158,15 +158,16 @@
                 </tr>
             </thead>
             <tbody style="text-align: center;">
-                @for ($i = 0; $i < 150; $i++)
+                @foreach ($sale->saleDetail as $key => $saleDetail)
                     <tr>
-                        <td style="border-left: 1px solid black;">1</td>
-                        <td style="border-left: 1px solid black; text-align: left;">IMPORTA KURSI OFFICE</td>
-                        <td style="border-left: 1px solid black;">1</td>
+                        <td style="border-left: 1px solid black;">{{ $key + 1 }}</td>
+                        <td style="border-left: 1px solid black; text-align: left;">{{ $saleDetail->product->name }}
+                        </td>
+                        <td style="border-left: 1px solid black;">{{ $saleDetail->qty }}</td>
                         <td style="border-left: 1px solid black;">UNIT</td>
                         <td style="border-left: 1px solid black;"></td>
                     </tr>
-                @endfor
+                @endforeach
             </tbody>
         </table>
 
@@ -183,7 +184,7 @@
                                         <td></td>
                                         <td></td>
                                         <td colspan="1">
-                                            <p style="margin-bottom: 75px; margin-top: 70px;">XXXXXXXXXXXX</p>
+                                            <p style="margin-bottom: 75px; margin-top: 70px;">{{ $company->name }}</p>
                                         </td>
                                     </tr>
                                 </thead>
@@ -200,7 +201,7 @@
                                         </td>
                                         <td>
                                             <span
-                                                style="border-top: 1px solid black; width: 150px;display: inline-block; text-align: center;">XXXXXXXXXXXX</span>
+                                                style="border-top: 1px solid black; width: 150px;display: inline-block; text-align: center;"></span>
                                         </td>
                                     </tr>
                                 </tbody>

resources/views/PDF/Sales/Invoice.blade.php

@@ -72,10 +72,10 @@
                             <td style="padding: 0;">
                                 <table style="border-spacing: 0;">
                                     <tr>
-                                        <td>XXXXXXXXXXXX</td>
+                                        <td>{{ $sale->customer->name }}</td>
                                     </tr>
                                     <tr>
-                                        <td>XXXXXXXXXXXX</td>
+                                        <td>{{ $sale->customer->address }}</td>
                                     </tr>
                                 </table>
                             </td>
@@ -86,7 +86,7 @@
                             <td style="padding: 0">
                                 <table style="border-spacing: 0">
                                     <tr>
-                                        <td>XXXXXXXXXXXX</td>
+                                        <td>{{ $sale->customer->npwp }}</td>
                                     </tr>
                                 </table>
                             </td>
@@ -101,7 +101,7 @@
                                     <tr>
                                         <td>NPWP</td>
                                         <td>:</td>
-                                        <td>XXXXXXXXXXXXXXX</td>
+                                        <td>{{ $company->npwp }}</td>
                                     </tr>
                                     <tr>
                                         <td>Invoice No</td>
@@ -111,12 +111,12 @@
                                     <tr>
                                         <td>Date</td>
                                         <td>:</td>
-                                        <td>XXXXXXXXXXXX</td>
+                                        <td>{{ $sale->updated_at }}</td>
                                     </tr>
                                     <tr>
                                         <td>PO No</td>
                                         <td>:</td>
-                                        <td>XXXXXXXXXXXX</td>
+                                        <td>{{ $sale->number }}</td>
                                     </tr>
                                     <tr>
                                         <td>DO No</td>
@@ -153,19 +153,28 @@
                 </tr>
             </thead>
             <tbody style="text-align: center;">
-                @for ($i = 0; $i < 150; $i++)
+                @foreach ($sale->saleDetail as $key => $saleDetail)
                     <tr>
-                        <th>1</th>
-                        <td style="text-align: left;">IMPORT KURSI OFFICE</td>
-                        <td>1</td>
+                        <th>{{ $key + 1 }}</th>
+                        <td style="text-align: left;">{{ $saleDetail->product->name }}</td>
+                        <td>{{ $saleDetail->qty }}</td>
                         <td>UNIT</td>
-                        <td style="text-align: right;">800.000</td>
-                        <td style="text-align: right;">800.000</td>
+                        <td style="text-align: right;">
+                            {{ App\Services\HelperService::rupiahFormat($saleDetail->price) }}</td>
+                        <td style="text-align: right;">
+                            {{ App\Services\HelperService::rupiahFormat($saleDetail->price * $saleDetail->qty) }}
+                        </td>
                     </tr>
-                @endfor
+                @endforeach
             </tbody>
             <tfoot style="border-top: 1px solid black; border-bottom: 1px solid black; text-align: right;">
                 <tr>
+                    <td colspan="4"></td>
+                    <td>TOTAL</td>
+                    <td>{{ App\Services\HelperService::rupiahFormat(App\Services\SaleService::totalPrice($sale)) }}
+                    </td>
+                </tr>
+                {{-- <tr>
                     <td colspan="4"></td>
                     <td>SUB. TOTAL</td>
                     <td>800.000</td>
@@ -179,10 +188,15 @@
                     <td colspan="4"></td>
                     <td>TOTAL IDR</td>
                     <td>888.000</td>
-                </tr>
+                </tr> --}}
             </tfoot>
         </table>
 
+        <p style="margin: 0; font-size: x-small; font-weight: bold; text-align: right;">Semua produk dikenakan ppn
+            sebesar
+            {{ $sale->ppn ? $ppn : 0 }} %
+        </p>
+
         <div style="position: absolute; bottom: 0; left: 0; right: 0;">
             <table>
                 <tbody>
@@ -194,7 +208,7 @@
                                     <tr>
                                         <td></td>
                                         <td colspan="1">
-                                            <p style="margin-bottom: 75px; margin-top: 70px;">XXXXXXXXXXXX</p>
+                                            <p style="margin-bottom: 75px; margin-top: 70px;">{{ $company->name }}</p>
                                         </td>
                                     </tr>
                                 </thead>