fix: master

app/Exports/TransactionExport.php

@@ -55,6 +55,8 @@ class TransactionExport implements ShouldAutoSize, Responsable, FromView, WithSt
             4 => [
                 'font' => ['bold' => true],
             ],
+            'C' => ['alignment' => ['horizontal' => 'left']],
+            'D' => ['alignment' => ['horizontal' => 'left']],
             $lastRow => [
                 'font' => ['bold' => true, 'size' => 12],
                 'alignment' => ['horizontal' => 'left'],

app/Http/Controllers/DiscountController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Requests\StoreDiscountRequest;
+use App\Http\Requests\Discount\StoreDiscountRequest;
 use App\Models\Discount;
 use Illuminate\Http\Request;
 

app/Http/Controllers/ReportTransactionController.php

@@ -30,9 +30,11 @@ class ReportTransactionController extends Controller
             ->flatten(1)
             ->toArray();
 
+        $transaction = (new TransactionService)->getPaginator($transactions);
+
         return inertia('transaction/Report', [
             'filters' => request()->all('startDate', 'endDate', 'outlet'),
-            'transactions' => (new TransactionService)->getPaginator($transactions),
+            'transactions' => $transaction,
             'outlets' => Outlet::all()
                 ->transform(fn($outlet) => [
                     'label' => $outlet->name,

app/Http/Controllers/ThermalPrintingController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Http\Controllers\Controller;
-// use App\Models\Transaction;
 use App\Models\Transaction;
 use Exception;
 use Hoa\Socket\Client as SocketClient;
@@ -13,9 +12,6 @@ class ThermalPrintingController extends Controller
 {
     public function __invoke(Transaction $transaction)
     {
-        // $thermalPrinting = new ThermalPrinting($transaction);
-        // $thermalPrinting->startPrinting(1);
-
         $transaction->load(['outlet', 'customer', 'transactionDetails.laundry']);
         $discount = $transaction->discount;
         $subTotalAsString = $transaction->subTotalAsString();

app/Http/Controllers/TransactionController.php

@@ -158,16 +158,27 @@ class TransactionController extends Controller
                 }
             }
 
-            $transaction->mutation()->create([
-                'type' => 1,
-                'amount' => $transaction->totalPrice(),
-                'outlet_id' => $request->user()->outlet_id,
-            ]);
+            if ($request->discount) {
+                $transaction->mutation()->create([
+                    'type' => 1,
+                    'amount' => $transaction->totalPrice() < 0 ? $transaction->subTotal() : $transaction->totalPrice(),
+                    'outlet_id' => $request->user()->outlet_id,
+                ]);
 
-            DB::commit();
+                $transaction->mutation()->create([
+                    'type' => 2,
+                    'amount' => $transaction->totalPrice() < 0 ? $transaction->subTotal() : $transaction->totalPrice(),
+                    'outlet_id' => $request->user()->outlet_id,
+                ]);
+            } else {
+                $transaction->mutation()->create([
+                    'type' => 1,
+                    'amount' => $transaction->totalPrice(),
+                    'outlet_id' => $request->user()->outlet_id,
+                ]);
+            }
 
-            // $thermalPrinting = new ThermalPrinting($transaction);
-            // $thermalPrinting->startPrinting(2);
+            DB::commit();
 
             // $transaction = Transaction::with(['outlet', 'customer', 'transactionDetails.laundry'])->latest()->first();
 

app/Http/Requests/StoreDiscountRequest.php → app/Http/Requests/Discount/StoreDiscountRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Http\Requests\Discount;
 
 use Illuminate\Foundation\Http\FormRequest;
 

app/Models/Expense.php

@@ -2,10 +2,10 @@
 
 namespace App\Models;
 
-use App\Models\Helpers\CurrencyFormat;
 use App\Models\Mutation;
 use App\Models\Outlet;
 use App\Models\User;
+use App\Services\CurrencyFormatService;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -13,7 +13,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class Expense extends Model
 {
-    use HasFactory, CurrencyFormat;
+    use HasFactory;
 
     protected $fillable = [
         'description',
@@ -22,17 +22,17 @@ class Expense extends Model
         'outlet_id',
     ];
 
-    public function createdAt(): Attribute
+    protected function createdAt(): Attribute
     {
         return Attribute::make(
             get:fn($value) => Carbon::parse($value)->translatedFormat('l d/m/Y')
         );
     }
 
-    public function amount(): Attribute
+    protected function amount(): Attribute
     {
         return Attribute::make(
-            get:fn($value) => '- ' . $this->setRupiahFormat($value, 0, true)
+            get:fn($value) => (new CurrencyFormatService)->setRupiahFormat(-$value, true)
         );
     }
 

app/Models/Helpers/CurrencyFormat.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Models\Helpers;
-
-trait CurrencyFormat
-{
-    protected function setRupiahFormat(int $number, int $decimal = 0, bool $sign = false)
-    {
-        if ($sign) {
-            return 'Rp' . number_format($number, $decimal, ',', '.');
-
-        } else {
-            return number_format($number, $decimal, ',', '.');
-        }
-    }
-}

app/Models/Helpers/HasMutation.php

@@ -1,53 +0,0 @@
-<?php
-
-namespace App\Models\Helpers;
-
-use Illuminate\Database\Eloquent\Collection;
-
-trait HasMutation
-{
-    use CurrencyFormat;
-
-    protected static function totalIncome(Collection $collections)
-    {
-        foreach ($collections->chunk(100) as $chunk) {
-            return $chunk->sum(function ($collect) {
-                if ($collect->getRawOriginal('type') == 1) {
-                    return $collect->getRawOriginal('amount');
-                }
-            });
-        }
-    }
-
-    protected static function totalExpense(Collection $collections)
-    {
-        foreach ($collections->chunk(100) as $chunk) {
-            return $chunk->sum(function ($collect) {
-                if ($collect->getRawOriginal('type') == 2) {
-                    return $collect->getRawOriginal('amount');
-                }
-            });
-        }
-    }
-
-    protected static function totalIncomeAsString(Collection $collections)
-    {
-        return parent::setRupiahFormat(self::totalIncome($collections), 0, true);
-
-    }
-
-    protected static function totalExpenseAsString(Collection $collections)
-    {
-        return '- ' . parent::setRupiahFormat(self::totalExpense($collections), 0, true);
-    }
-
-    protected static function totalAmount(Collection $collections)
-    {
-        $amount = self::totalIncome($collections) - self::totalExpense($collections);
-        if ($amount < 0) {
-            return '- ' . parent::setRupiahFormat(abs($amount), 0, true);
-        } else {
-            return parent::setRupiahFormat($amount, 0, true);
-        }
-    }
-}

app/Models/Laundry.php

@@ -2,14 +2,14 @@
 
 namespace App\Models;
 
-use App\Models\Helpers\CurrencyFormat;
+use App\Services\CurrencyFormatService;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Laundry extends Model
 {
-    use HasFactory, CurrencyFormat;
+    use HasFactory;
 
     protected $fillable = [
         'name',
@@ -34,7 +34,7 @@ class Laundry extends Model
     protected function price(): Attribute
     {
         return Attribute::make(
-            get:fn($value) => $this->setRupiahFormat($value, 0, true)
+            get:fn($value) => (new CurrencyFormatService)->setRupiahFormat($value, true)
         );
     }
 

app/Models/Mutation.php

@@ -2,8 +2,7 @@
 
 namespace App\Models;
 
-use App\Models\Helpers\CurrencyFormat;
-use App\Models\Helpers\HasMutation;
+use App\Services\CurrencyFormatService;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -11,7 +10,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class Mutation extends Model
 {
-    use HasFactory, CurrencyFormat, HasMutation;
+    use HasFactory;
 
     protected $fillable = [
         'type',
@@ -21,22 +20,27 @@ class Mutation extends Model
         'expense_id',
     ];
 
-    public function createdAt(): Attribute
+    protected function createdAt(): Attribute
     {
         return Attribute::make(
             get:fn($value) => Carbon::parse($value)->translatedFormat('l d/m/Y')
         );
     }
 
-    public function amount(): Attribute
+    protected function amount(): Attribute
     {
         return Attribute::make(
-            get:fn($value) => $this->transaction_id ? $this->setRupiahFormat($value, 0, true)
-            : '- ' . $this->setRupiahFormat($value, 0, true)
+            get:function ($value) {
+                if ($this->getRawOriginal('type') == 1) {
+                    return (new CurrencyFormatService)->setRupiahFormat($value, true);
+                } else {
+                    return (new CurrencyFormatService)->setRupiahFormat(-$value, true);
+                }
+            },
         );
     }
 
-    public function type(): Attribute
+    protected function type(): Attribute
     {
         return Attribute::make(
             get:fn($value) => $value == 1 ? __('words.income') : __('words.expense')

app/Models/Product.php

@@ -2,14 +2,14 @@
 
 namespace App\Models;
 
-use App\Models\Helpers\CurrencyFormat;
+use App\Services\CurrencyFormatService;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Product extends Model
 {
-    use HasFactory, CurrencyFormat;
+    use HasFactory;
 
     protected $fillable = [
         'name',
@@ -34,7 +34,7 @@ class Product extends Model
     protected function price(): Attribute
     {
         return Attribute::make(
-            get:fn($value) => $this->setRupiahFormat($value, 0, true)
+            get:fn($value) => (new CurrencyFormatService)->setRupiahFormat($value, true)
         );
     }
 

app/Models/Transaction.php

@@ -3,12 +3,12 @@
 namespace App\Models;
 
 use App\Models\Customer;
-use App\Models\Helpers\CurrencyFormat;
 use App\Models\Mutation;
 use App\Models\Outlet;
 use App\Models\TransactionDetail;
 use App\Models\TransactionStatus;
 use App\Models\User;
+use App\Services\CurrencyFormatService;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -16,7 +16,7 @@ use Illuminate\Database\Eloquent\Model;
 
 class Transaction extends Model
 {
-    use HasFactory, CurrencyFormat;
+    use HasFactory;
 
     protected $fillable = [
         'transaction_number',
@@ -27,17 +27,17 @@ class Transaction extends Model
         'outlet_id',
     ];
 
-    public function createdAt(): Attribute
+    protected function createdAt(): Attribute
     {
         return Attribute::make(
             get:fn($value) => Carbon::parse($value)->translatedFormat('l d/m/Y')
         );
     }
 
-    public function discount(): Attribute
+    protected function discount(): Attribute
     {
         return Attribute::make(
-            get:fn($value) => $this->setRupiahFormat($value, 0, true)
+            get:fn($value) => (new CurrencyFormatService)->setRupiahFormat($value, true)
         );
     }
 
@@ -90,38 +90,38 @@ class Transaction extends Model
         });
     }
 
-    public function totalPrice()
+    public function subTotal()
     {
-        $price = $this->transactionDetails->sum(function ($transactionDetail) {
+        $subTotal = $this->transactionDetails->sum(function ($transactionDetail) {
             $price = $transactionDetail->getRawOriginal('price') * $transactionDetail->quantity;
             return $price - $price * ($transactionDetail->getRawOriginal('discount') / 100);
         });
 
-        return $price - $this->getRawOriginal('discount');
+        return $subTotal;
     }
 
-    public function totalPriceAsString()
+    public function subTotalAsString()
     {
-        return $this->setRupiahFormat($this->totalPrice());
+        return (new CurrencyFormatService)->setRupiahFormat($this->subTotal());
     }
 
-    public function totalPriceAsFullString()
+    public function totalPrice()
     {
-        return $this->setRupiahFormat($this->totalPrice(), 0, true);
+        $totalPrice = $this->subTotal() - $this->getRawOriginal('discount');
+        if ($totalPrice < 0) {
+            return 0;
+        } else {
+            return $totalPrice;
+        }
     }
 
-    public function subTotal()
+    public function totalPriceAsString()
     {
-        $subTotal = $this->transactionDetails->sum(function ($transactionDetail) {
-            $price = $transactionDetail->getRawOriginal('price') * $transactionDetail->quantity;
-            return $price - $price * ($transactionDetail->getRawOriginal('discount') / 100);
-        });
-
-        return $subTotal;
+        return (new CurrencyFormatService)->setRupiahFormat($this->totalPrice());
     }
 
-    public function subTotalAsString()
+    public function totalPriceAsFullString()
     {
-        return $this->setRupiahFormat($this->subTotal());
+        return (new CurrencyFormatService)->setRupiahFormat($this->totalPrice(), true);
     }
 }

app/Models/TransactionDetail.php

@@ -2,17 +2,17 @@
 
 namespace App\Models;
 
-use App\Models\Helpers\CurrencyFormat;
 use App\Models\Laundry;
 use App\Models\Product;
 use App\Models\Transaction;
+use App\Services\CurrencyFormatService;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class TransactionDetail extends Model
 {
-    use HasFactory, CurrencyFormat;
+    use HasFactory;
 
     protected $fillable = [
         'price',
@@ -26,7 +26,7 @@ class TransactionDetail extends Model
     protected function price(): Attribute
     {
         return Attribute::make(
-            get:fn($value) => $this->setRupiahFormat($value, 0, true)
+            get:fn($value) => (new CurrencyFormatService)->setRupiahFormat($value, true)
         );
     }
 
@@ -62,11 +62,11 @@ class TransactionDetail extends Model
 
     public function totalPriceAsString()
     {
-        return $this->setRupiahFormat($this->totalPrice());
+        return (new CurrencyFormatService)->setRupiahFormat($this->totalPrice());
     }
 
     public function totalPriceAsFullString()
     {
-        return $this->setRupiahFormat($this->totalPrice(), 0, true);
+        return (new CurrencyFormatService)->setRupiahFormat($this->totalPrice(), true);
     }
 }

app/Services/CurrencyFormatService.php

@@ -4,12 +4,20 @@ namespace App\Services;
 
 class CurrencyFormatService
 {
-    public function setRupiahFormat(int $number, int $decimal = 0, bool $sign = false)
+    public function setRupiahFormat(int $number, bool $sign = false)
     {
         if ($sign) {
-            return 'Rp' . number_format($number, $decimal, ',', '.');
+            if ($number < 0) {
+                return '-Rp' . number_format(abs($number), 0, ',', '.');
+            } else {
+                return 'Rp' . number_format($number, 0, ',', '.');
+            }
         } else {
-            return number_format($number, $decimal, ',', '.');
+            if ($number < 0) {
+                return '-' . number_format(abs($number), 0, ',', '.');
+            } else {
+                return number_format($number, 0, ',', '.');
+            }
         }
     }
 }

app/Services/MutationService.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Services;
+
+use Illuminate\Database\Eloquent\Collection;
+
+class MutationService extends CurrencyFormatService
+{
+    public function totalIncome(Collection $collections)
+    {
+        foreach ($collections->chunk(100) as $chunk) {
+            return $chunk->sum(function ($collect) {
+                if ($collect->getRawOriginal('type') == 1) {
+                    return $collect->getRawOriginal('amount');
+                }
+            });
+        }
+    }
+
+    public function totalExpense(Collection $collections)
+    {
+        foreach ($collections->chunk(100) as $chunk) {
+            return $chunk->sum(function ($collect) {
+                if ($collect->getRawOriginal('type') == 2) {
+                    return $collect->getRawOriginal('amount');
+                }
+            });
+        }
+    }
+
+    public function totalIncomeAsString(Collection $collections)
+    {
+        return $this->setRupiahFormat($this->totalIncome($collections), true);
+    }
+
+    public function totalExpenseAsString(Collection $collections)
+    {
+        return $this->setRupiahFormat($this->totalExpense($collections), true);
+    }
+
+    public function totalAmount(Collection $collections)
+    {
+        $amount = $this->totalIncome($collections) - $this->totalExpense($collections);
+        return $this->setRupiahFormat($amount, true);
+    }
+}

app/Http/Controllers/Helpers/ThermalPrinting.php → app/Services/ThermalPrintingService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\Helpers;
+namespace App\Services;
 
 use App\Models\Transaction;
 use Mike42\Escpos\PrintConnectors\FilePrintConnector;

app/Services/TransactionService.php

@@ -24,8 +24,7 @@ class TransactionService
 
     public function totalPrice(Collection $collections)
     {
-        $collections->transform(fn($transactions) => $transactions->totalPrice());
-        return $collections;
+        return $collections->transform(fn($transactions) => $transactions->totalPrice());
     }
 
     public function totalPriceGroup(Collection $collections)
@@ -35,6 +34,6 @@ class TransactionService
 
     public function totalPriceGroupAsString(Collection $collections)
     {
-        return (new CurrencyFormatService)->setRupiahFormat($this->totalPriceGroup($collections), 0, true);
+        return (new CurrencyFormatService)->setRupiahFormat($this->totalPriceGroup($collections), true);
     }
 }

composer.lock

@@ -1719,16 +1719,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v9.6.0",
+            "version": "v9.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "47940a1a8774b96696ed57e6736ccea4a880c057"
+                "reference": "54c9696ee3e558ab29317ed6e0cb16bb9db5aad4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/47940a1a8774b96696ed57e6736ccea4a880c057",
-                "reference": "47940a1a8774b96696ed57e6736ccea4a880c057",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/54c9696ee3e558ab29317ed6e0cb16bb9db5aad4",
+                "reference": "54c9696ee3e558ab29317ed6e0cb16bb9db5aad4",
                 "shasum": ""
             },
             "require": {
@@ -1894,7 +1894,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2022-03-29T14:41:26+00:00"
+            "time": "2022-04-05T15:07:51+00:00"
         },
         {
             "name": "laravel/sanctum",
@@ -2090,16 +2090,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.2.3",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "47b015bc4e50fd4438c1ffef6139a1fb65d2ab71"
+                "reference": "32a49eb2b38fe5e5c417ab748a45d0beaab97955"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/47b015bc4e50fd4438c1ffef6139a1fb65d2ab71",
-                "reference": "47b015bc4e50fd4438c1ffef6139a1fb65d2ab71",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/32a49eb2b38fe5e5c417ab748a45d0beaab97955",
+                "reference": "32a49eb2b38fe5e5c417ab748a45d0beaab97955",
                 "shasum": ""
             },
             "require": {
@@ -2108,17 +2108,19 @@
                 "php": "^7.4 || ^8.0",
                 "psr/event-dispatcher": "^1.0",
                 "symfony/deprecation-contracts": "^2.1 || ^3.0",
-                "symfony/polyfill-php80": "^1.15"
+                "symfony/polyfill-php80": "^1.16"
             },
             "require-dev": {
                 "cebe/markdown": "^1.0",
                 "commonmark/cmark": "0.30.0",
                 "commonmark/commonmark.js": "0.30.0",
                 "composer/package-versions-deprecated": "^1.8",
+                "embed/embed": "^4.4",
                 "erusev/parsedown": "^1.0",
                 "ext-json": "*",
                 "github/gfm": "0.29.0",
                 "michelf/php-markdown": "^1.4",
+                "nyholm/psr7": "^1.5",
                 "phpstan/phpstan": "^0.12.88 || ^1.0.0",
                 "phpunit/phpunit": "^9.5.5",
                 "scrutinizer/ocular": "^1.8.1",
@@ -2133,7 +2135,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.3-dev"
+                    "dev-main": "2.4-dev"
                 }
             },
             "autoload": {
@@ -2190,7 +2192,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-26T21:24:45+00:00"
+            "time": "2022-04-07T22:37:05+00:00"
         },
         {
             "name": "league/config",
@@ -2276,16 +2278,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "3.0.13",
+            "version": "3.0.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "15dc1ccb2db8daef507c4d3e501565bae42a9f0e"
+                "reference": "3b71cd136dc0331ee87b636b25f4ee339368c718"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/15dc1ccb2db8daef507c4d3e501565bae42a9f0e",
-                "reference": "15dc1ccb2db8daef507c4d3e501565bae42a9f0e",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/3b71cd136dc0331ee87b636b25f4ee339368c718",
+                "reference": "3b71cd136dc0331ee87b636b25f4ee339368c718",
                 "shasum": ""
             },
             "require": {
@@ -2346,7 +2348,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/3.0.13"
+                "source": "https://github.com/thephpleague/flysystem/tree/3.0.15"
             },
             "funding": [
                 {
@@ -2362,7 +2364,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-02T08:55:13+00:00"
+            "time": "2022-04-08T18:36:06+00:00"
         },
         {
             "name": "league/mime-type-detection",
@@ -2784,16 +2786,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "2.4.0",
+            "version": "2.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "d7fd7450628561ba697b7097d86db72662f54aef"
+                "reference": "4192345e260f1d51b365536199744b987e160edc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/d7fd7450628561ba697b7097d86db72662f54aef",
-                "reference": "d7fd7450628561ba697b7097d86db72662f54aef",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/4192345e260f1d51b365536199744b987e160edc",
+                "reference": "4192345e260f1d51b365536199744b987e160edc",
                 "shasum": ""
             },
             "require": {
@@ -2867,7 +2869,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/2.4.0"
+                "source": "https://github.com/Seldaek/monolog/tree/2.5.0"
             },
             "funding": [
                 {
@@ -2879,7 +2881,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-14T12:44:37+00:00"
+            "time": "2022-04-08T15:43:54+00:00"
         },
         {
             "name": "myclabs/php-enum",
@@ -4236,16 +4238,16 @@
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v3.0.0",
+            "version": "v3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced"
+                "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/c726b64c1ccfe2896cb7df2e1331c357ad1c8ced",
-                "reference": "c726b64c1ccfe2896cb7df2e1331c357ad1c8ced",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
+                "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c",
                 "shasum": ""
             },
             "require": {
@@ -4283,7 +4285,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.1"
             },
             "funding": [
                 {
@@ -4299,7 +4301,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-01T23:48:49+00:00"
+            "time": "2022-01-02T09:55:41+00:00"
         },
         {
             "name": "symfony/error-handler",
@@ -4457,16 +4459,16 @@
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v3.0.0",
+            "version": "v3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "aa5422287b75594b90ee9cd807caf8f0df491385"
+                "reference": "7bc61cc2db649b4637d331240c5346dcc7708051"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/aa5422287b75594b90ee9cd807caf8f0df491385",
-                "reference": "aa5422287b75594b90ee9cd807caf8f0df491385",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7bc61cc2db649b4637d331240c5346dcc7708051",
+                "reference": "7bc61cc2db649b4637d331240c5346dcc7708051",
                 "shasum": ""
             },
             "require": {
@@ -4516,7 +4518,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.0.0"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.0.1"
             },
             "funding": [
                 {
@@ -4532,7 +4534,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-15T12:33:35+00:00"
+            "time": "2022-01-02T09:55:41+00:00"
         },
         {
             "name": "symfony/finder",
@@ -5737,16 +5739,16 @@
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v3.0.0",
+            "version": "v3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "36715ebf9fb9db73db0cb24263c79077c6fe8603"
+                "reference": "e517458f278c2131ca9f262f8fbaf01410f2c65c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/36715ebf9fb9db73db0cb24263c79077c6fe8603",
-                "reference": "36715ebf9fb9db73db0cb24263c79077c6fe8603",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e517458f278c2131ca9f262f8fbaf01410f2c65c",
+                "reference": "e517458f278c2131ca9f262f8fbaf01410f2c65c",
                 "shasum": ""
             },
             "require": {
@@ -5799,7 +5801,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v3.0.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v3.0.1"
             },
             "funding": [
                 {
@@ -5815,7 +5817,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-04T17:53:12+00:00"
+            "time": "2022-03-13T20:10:05+00:00"
         },
         {
             "name": "symfony/string",
@@ -5999,16 +6001,16 @@
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v3.0.0",
+            "version": "v3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "1b6ea5a7442af5a12dba3dbd6d71034b5b234e77"
+                "reference": "c4183fc3ef0f0510893cbeedc7718fb5cafc9ac9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/1b6ea5a7442af5a12dba3dbd6d71034b5b234e77",
-                "reference": "1b6ea5a7442af5a12dba3dbd6d71034b5b234e77",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/c4183fc3ef0f0510893cbeedc7718fb5cafc9ac9",
+                "reference": "c4183fc3ef0f0510893cbeedc7718fb5cafc9ac9",
                 "shasum": ""
             },
             "require": {
@@ -6057,7 +6059,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v3.0.0"
+                "source": "https://github.com/symfony/translation-contracts/tree/v3.0.1"
             },
             "funding": [
                 {
@@ -6073,7 +6075,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-07T12:43:40+00:00"
+            "time": "2022-01-02T09:55:41+00:00"
         },
         {
             "name": "symfony/var-dumper",
@@ -6165,16 +6167,16 @@
         },
         {
             "name": "tightenco/ziggy",
-            "version": "v1.4.5",
+            "version": "v1.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tighten/ziggy.git",
-                "reference": "d3c74474f624ab80b7fb4e3e264e62bb4043eee2"
+                "reference": "a9e0e078ae6f0768836bc640a80f4cf99fa3d08f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tighten/ziggy/zipball/d3c74474f624ab80b7fb4e3e264e62bb4043eee2",
-                "reference": "d3c74474f624ab80b7fb4e3e264e62bb4043eee2",
+                "url": "https://api.github.com/repos/tighten/ziggy/zipball/a9e0e078ae6f0768836bc640a80f4cf99fa3d08f",
+                "reference": "a9e0e078ae6f0768836bc640a80f4cf99fa3d08f",
                 "shasum": ""
             },
             "require": {
@@ -6226,9 +6228,9 @@
             ],
             "support": {
                 "issues": "https://github.com/tighten/ziggy/issues",
-                "source": "https://github.com/tighten/ziggy/tree/v1.4.5"
+                "source": "https://github.com/tighten/ziggy/tree/v1.4.6"
             },
-            "time": "2022-03-25T22:36:59+00:00"
+            "time": "2022-04-08T15:12:23+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -6811,16 +6813,16 @@
         },
         {
             "name": "laravel/sail",
-            "version": "v1.13.8",
+            "version": "v1.13.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sail.git",
-                "reference": "b00f1b64afff9c16355d23bb1e0f83a7ea9bbb7e"
+                "reference": "7bb294fe99fc42c3b1bee83fb667cd7698b3c385"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sail/zipball/b00f1b64afff9c16355d23bb1e0f83a7ea9bbb7e",
-                "reference": "b00f1b64afff9c16355d23bb1e0f83a7ea9bbb7e",
+                "url": "https://api.github.com/repos/laravel/sail/zipball/7bb294fe99fc42c3b1bee83fb667cd7698b3c385",
+                "reference": "7bb294fe99fc42c3b1bee83fb667cd7698b3c385",
                 "shasum": ""
             },
             "require": {
@@ -6867,7 +6869,7 @@
                 "issues": "https://github.com/laravel/sail/issues",
                 "source": "https://github.com/laravel/sail"
             },
-            "time": "2022-03-23T12:35:34+00:00"
+            "time": "2022-04-04T15:21:51+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -7002,16 +7004,16 @@
         },
         {
             "name": "nunomaduro/collision",
-            "version": "v6.1.0",
+            "version": "v6.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "df09e21a5e5d5a7d51a8b9ecd44d3dd150d97fec"
+                "reference": "c379636dc50e829edb3a8bcb944a01aa1aed8f25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/df09e21a5e5d5a7d51a8b9ecd44d3dd150d97fec",
-                "reference": "df09e21a5e5d5a7d51a8b9ecd44d3dd150d97fec",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/c379636dc50e829edb3a8bcb944a01aa1aed8f25",
+                "reference": "c379636dc50e829edb3a8bcb944a01aa1aed8f25",
                 "shasum": ""
             },
             "require": {
@@ -7022,10 +7024,10 @@
             },
             "require-dev": {
                 "brianium/paratest": "^6.4.1",
-                "laravel/framework": "^9.0",
+                "laravel/framework": "^9.7",
                 "nunomaduro/larastan": "^1.0.2",
                 "nunomaduro/mock-final-classes": "^1.1.0",
-                "orchestra/testbench": "^7.0.0",
+                "orchestra/testbench": "^7.3.0",
                 "phpunit/phpunit": "^9.5.11"
             },
             "type": "library",
@@ -7085,7 +7087,7 @@
                     "type": "patreon"
                 }
             ],
-            "time": "2022-01-18T17:49:08+00:00"
+            "time": "2022-04-05T15:31:38+00:00"
         },
         {
             "name": "phar-io/manifest",

resources/views/excel/mutation-report.blade.php

@@ -33,15 +33,15 @@
         </tr>
         <tr>
             <td colspan="3">Pendapatan</td>
-            <td>{{ App\Models\Mutation::totalIncomeAsString($mutations) }}</td>
+            <td>{{ (new App\Services\MutationService)->totalIncomeAsString($mutations) }}</td>
         </tr>
         <tr>
             <td colspan="3">Pengeluran</td>
-            <td>{{ App\Models\Mutation::totalExpenseAsString($mutations) }}</td>
+            <td>{{ (new App\Services\MutationService)->totalExpenseAsString($mutations) }}</td>
         </tr>
         <tr>
             <td colspan="3">Jumlah</td>
-            <td>{{ App\Models\Mutation::totalAmount($mutations) }}</td>
+            <td>{{ (new App\Services\MutationService)->totalAmount($mutations) }}</td>
         </tr>
     </tbody>
 </table>

resources/views/excel/transaction-report.blade.php

@@ -22,7 +22,7 @@
                     <td>{{ ++$index }}</td>
                     <td>{{ $transaction['createdAt'] }}</td>
                     <td>{{ $transaction['totalTransaction'] }}</td>
-                    <td>{{ (new App\Services\CurrencyFormatService)->setRupiahFormat($transaction['totalPrice'], 0, true) }}</td>
+                    <td>{{ (new App\Services\CurrencyFormatService)->setRupiahFormat($transaction['totalPrice'], true) }}</td>
                 </tr>
             @endforeach
         @endforeach
@@ -32,7 +32,7 @@
         <tr>
             <td colspan="2">Transaksi / Nilai</td>
             <td>{{ $transactions->sum('totalTransaction') }}</td>
-            <td>{{ (new App\Services\CurrencyFormatService)->setRupiahFormat($transactions->sum('totalPrice'), 0, true)  }}</td>
+            <td>{{ (new App\Services\CurrencyFormatService)->setRupiahFormat($transactions->sum('totalPrice'), true) }}</td>
         </tr>
     </tbody>
 </table>