Update

- Fixed: Migration For MultiStore
- Removed: Unecessary code

Author: Blair2004

app/Classes/Currency.php

@@ -1,13 +1,27 @@
 <?php
 namespace App\Classes;
 
+use App\Services\CurrencyService;
+
 class Currency 
 {
     public static function define( $amount )
     {
         return ns()->currency->define( $amount );
     }
 
+    /**
+     * Will return a new intance using
+     * the default value.
+     * 
+     * @param float $amount
+     * @return CurrencyService
+     */
+    public static function fresh( $amount ): CurrencyService
+    {
+        return ns()->currency->fresh( $amount );
+    }
+
     public static function raw( $amount )
     {
         return ns()->currency->getRaw( $amount );

app/Services/CurrencyService.php

@@ -38,9 +38,38 @@ public function __construct( $value, $config = [])
         $this->thousand_separator   =   $thousand_separator ?? self::$_thousand_separator;
     }
 
+    /**
+     * Will intanciate a new instance
+     * using the default value
+     * 
+     * @param int|float $value
+     * @return CurrencyService
+     */
+    public function fresh( $value )
+    {
+        return new CurrencyService( $value, [
+            'currency_iso'          =>  $this->currency_iso,
+            'currency_symbol'       =>  $this->currency_symbol,
+            'currency_position'     =>  $this->currency_position,
+            'decimal_precision'     =>  $this->decimal_precision,
+            'decimal_separator'     =>  $this->decimal_separator,
+            'prefered_currency'     =>  $this->prefered_currency,
+            'thousand_separator'    =>  $this->thousand_separator,
+        ]);
+    }
+
+    /**
+     * Set a value for the current instance
+     * @param int|float $amount
+     * @return CurrencyService
+     */
     private static function __defineAmount( $amount ): CurrencyService
     {
-        return app()->make( CurrencyService::class )->value( $amount );
+        /**
+         * @var CurrencyService
+         */
+        $currencyService    =   app()->make( CurrencyService::class );
+        return $currencyService->value( $amount );
     }
 
     /**

app/Services/OrdersService.php

@@ -957,28 +957,35 @@ private function __computeOrderTotal($data)
          * increase the total with the
          * shipping fees and subtract the discounts
          */
-        $order->total           =   $this->currencyService->define( 
-                ( $order->subtotal + $order->shipping + ( $order->tax_type === 'exclusive' ? $order->tax_value : 0 ) ) - 
-                ( $order->total_coupons + $order->discount ) 
+        $order->total           =   Currency::fresh( $order->subtotal )
+            ->additionateBy( $order->shipping )
+            ->additionateBy(
+                ( $order->tax_type === 'exclusive' ? $order->tax_value : 0 )
             )
-            ->get();
+            ->subtractBy(
+                Currency::fresh( $order->total_coupons )
+                    ->additionateBy( $order->discount )
+                    ->getRaw()
+            )
+            ->getRaw();
 
         $order->gross_total     =   $order->total;
 
-        dump( 'tendered =>' . $order->tendered );
-        dump( 'total =>' . $order->total );
-
         /**
          * compute change
          */
-        $order->change          =   Currency::raw( $order->tendered - $order->total );
+        $order->change          =   Currency::fresh( $order->tendered )
+            ->subtractBy( $order->total )
+            ->getRaw();
 
         /**
          * compute gross total
          */
-        $order->net_total     =   $this->currencyService
-            ->define( $order->subtotal - $order->discount - $order->total_coupons - $order->tax_value )
-            ->get();
+        $order->net_total     =   Currency::fresh( $order->subtotal )
+            ->subtractBy( $order->discount )
+            ->subtractBy( $order->total_coupons )
+            ->subtractBy( $order->tax_value )
+            ->getRaw();
 
         return $order;
     }
@@ -1989,8 +1996,19 @@ public function refreshOrder(Order $order)
         $order->subtotal        =   $productTotal;
         $order->gross_total     =   $productGrossTotal;
         $order->discount        =   $this->computeOrderDiscount( $order );
-        $order->total           =   ( $productTotal + $orderShipping + ( $order->tax_type === 'exclusive' ? $order->tax_value : 0 ) ) - ( $order->discount + $order->total_coupons );
-        $order->change          =   Currency::raw( $order->tendered - $order->total );
+        $order->total           =   Currency::fresh( $productTotal )
+            ->additionateBy( $orderShipping )
+            ->additionateBy(
+                ( $order->tax_type === 'exclusive' ? $order->tax_value : 0 )
+            )
+            ->subtractBy( 
+                ns()->currency->fresh( $order->discount )
+                    ->additionateBy( $order->total_coupons )
+                    ->getRaw()
+            )
+            ->getRaw();
+
+        $order->change          =   Currency::fresh( $order->tendered )->subtractBy( $order->total )->getRaw();
 
         $refunds                =   $order->refund;
         $totalRefunds           =   $refunds->map( fn( $refund ) => $refund->total )->sum();

composer.json

@@ -29,7 +29,6 @@
         "picqer/php-barcode-generator": "^2.1",
         "pusher/pusher-php-server": "~3.0",
         "rct567/dom-query": "^0.8.0",
-        "sentry/sentry-laravel": "^2.10",
         "spatie/laravel-db-snapshots": "^1.7",
         "tormjens/eventy": "^0.7.0"
     },

database/migrations/schema-updates/2021_11_25_032153_update_procurement_table_nov2521.php

@@ -14,7 +14,7 @@ class UpdateProcurementTableNov2521 extends Migration
     public function up()
     {
         Schema::table( 'nexopos_procurements', function( Blueprint $table ) {
-            if ( Schema::hasColumn( 'nexopos_procurements', 'value' ) ) {
+            if ( Schema::hasColumn( 'nexopos_procurements', 'value' ) && ! Schema::hasColumn( 'nexopos_procurements', 'cost' ) ) {
                 $table->renameColumn( 'value', 'cost' );   
             }
         });
@@ -34,8 +34,8 @@ public function up()
     public function down()
     {
         Schema::table( 'nexopos_procurements', function( Blueprint $table ) {
-            if ( Schema::hasColumn( 'nexopos_procurements', 'value' ) ) {
-                $table->dropColumn( 'cost', 18, 5 );
+            if ( ! Schema::hasColumn( 'nexopos_procurements', 'value' ) && Schema::hasColumn( 'nexopos_procurements', 'cost' ) ) {
+                $table->renameColumn( 'cost', 'value' );
             }
         });
     }