Update

- Fixed: creating and updating coupon
- Added: new tests

Author: Blair2004

app/Crud/CouponCrud.php

@@ -433,19 +433,19 @@ public function get( $param )
      * @param  object entry
      * @return  void
      */
-    public function beforePut( $request, $entry )
+    public function beforePut( $fields, $entry )
     {
         if ( $this->permissions[ 'update' ] !== false ) {
             ns()->restrict( $this->permissions[ 'update' ] );
 
-            foreach( $request->input( 'selected_products.products' ) as $product_id ) {
+            foreach( $fields[ 'products' ] as $product_id ) {
                 $product    =   Product::find( $product_id );
                 if ( ! $product instanceof Product ) {
                     throw new Exception( __( 'Unable to save the coupon product as this product doens\'t exists.' ) );
                 }
             }
 
-            foreach( $request->input( 'selected_categories.categories' ) as $category_id ) {
+            foreach( $fields[ 'categories' ] as $category_id ) {
                 $category    =   ProductCategory::find( $category_id );
                 if ( ! $category instanceof ProductCategory ) {
                     throw new Exception( __( 'Unable to save the coupon category as this category doens\'t exists.' ) );
@@ -455,7 +455,7 @@ public function beforePut( $request, $entry )
             throw new NotAllowedException;
         }
 
-        return $request;
+        return $fields;
     }
 
     /**
@@ -464,21 +464,21 @@ public function beforePut( $request, $entry )
      * @param  object entry
      * @return  void
      */
-    public function afterPut( $request, $coupon )
+    public function afterPut( $fields, $coupon )
     {
-        $coupon->categories->each( function( $category ) use ( $request ) {
-            if ( ! in_array( $category->category_id, $request->input( 'selected_categories.categories' ) ) ) {
+        $coupon->categories->each( function( $category ) use ( $fields ) {
+            if ( ! in_array( $category->category_id, $fields[ 'categories' ] ) ) {
                 $category->delete();
             }
         });
 
-        $coupon->products->each( function( $product ) use ( $request ) {
-            if ( ! in_array( $product->product_id, $request->input( 'selected_products.products' ) ) ) {
+        $coupon->products->each( function( $product ) use ( $fields ) {
+            if ( ! in_array( $product->product_id, $fields[ 'products' ] ) ) {
                 $product->delete();
             }
         });
 
-        foreach( $request->input( 'selected_products.products' ) as $product_id ) {
+        foreach( $fields[ 'products' ] as $product_id ) {
             $productRelation                  =   CouponProduct::where( 'coupon_id', $coupon->id )
                 ->where( 'product_id', $product_id )
                 ->first();
@@ -492,7 +492,7 @@ public function afterPut( $request, $coupon )
             $productRelation->save();
         }
 
-        foreach( $request->input( 'selected_categories.categories' ) as $category_id ) {
+        foreach( $fields[ 'categories' ] as $category_id ) {
             $categoryRelation                  =   CouponCategory::where( 'coupon_id', $coupon->id )
                 ->where( 'category_id', $category_id )
                 ->first();
@@ -510,9 +510,9 @@ public function afterPut( $request, $coupon )
          * @var CustomerService
          */
         $customersService   =   app()->make( CustomerService::class );
-        $customersService->setCoupon( $request->all(), $coupon );
+        $customersService->setCoupon( $fields, $coupon );
 
-        return $request;
+        return $fields;
     }
 
     /**

app/Services/CashRegistersService.php

@@ -29,7 +29,7 @@ public function openRegister( Register $register, $amount, $description )
             );
         }
 
-        $registerHistory            =   new RegisterHistory;
+        $registerHistory                =   new RegisterHistory;
         $registerHistory->register_id   =   $register->id;
         $registerHistory->action        =   RegisterHistory::ACTION_OPENING;
         $registerHistory->author        =   Auth::id();
@@ -73,7 +73,7 @@ public function closeRegister( Register $register, $amount, $description )
             );
         }
 
-        $registerHistory    =   new RegisterHistory;
+        $registerHistory                =   new RegisterHistory;
         $registerHistory->register_id   =   $register->id;
         $registerHistory->action        =   RegisterHistory::ACTION_CLOSING;
         $registerHistory->author        =   Auth::id();

public/js/pos-init.min.js

@@ -5,7 +5,7 @@
     "/js/dashboard.min.js": "/js/dashboard.min.js?id=d84adbf74bac6693a9bc63d716a2ec4a",
     "/js/cashier.min.js": "/js/cashier.min.js?id=1177672fac425ea64d2adf3cf92110fc",
     "/js/update.min.js": "/js/update.min.js?id=359c7559d2e051df01ab3d8b1e8456bc",
-    "/js/pos-init.min.js": "/js/pos-init.min.js?id=264dc8e29e9ac89967ef3699b5d0ba5a",
+    "/js/pos-init.min.js": "/js/pos-init.min.js?id=4c01ea93e535d15a73de37dfa37c4749",
     "/js/pos.min.js": "/js/pos.min.js?id=cf4204ed94965b0bb1128d38d7a8ef45",
     "/js/auth.min.js": "/js/auth.min.js?id=7acb5663107a1dedc67cdb4eb5a1e1ab",
     "/js/setup.min.js": "/js/setup.min.js?id=666d58849dcf16f6a5d892ecadde8a0f",

public/mix-manifest.json

@@ -6,9 +6,9 @@
                 <div><ns-close-button @click="close()"></ns-close-button></div>
             </div>
             <div class="p-2">
-                <div v-if="settings !== null && settings.register" class="mb-2 p-3 bg-gray-400 font-bold text-white text-right flex justify-between">
+                <div v-if="register !== null" class="mb-2 p-3 bg-gray-400 font-bold text-white text-right flex justify-between">
                     <span>{{ __( 'Balance' ) }} </span>
-                    <span>{{ settings.register.balance | currency }}</span>
+                    <span>{{ register.balance | currency }}</span>
                 </div>
                 <div class="mb-2 p-3 bg-green-400 font-bold text-white text-right flex justify-between">
                     <span>{{ __( 'Input' ) }}</span>
@@ -44,6 +44,7 @@ export default {
             settingsSubscription: null,
             settings: null,
             action: null,
+            register: null,
             loaded: false,
             register_id: null, // conditionnally provider
             validation: new FormValidation,
@@ -53,6 +54,7 @@ export default {
     mounted() {
         this.title                  =   this.$popupParams.title;
         this.identifier             =   this.$popupParams.identifier;
+        this.register               =   this.$popupParams.register;
         this.action                 =   this.$popupParams.action;
         this.register_id            =   this.$popupParams.register_id;
         this.settingsSubscription   =   POS.settings.subscribe( settings => {

resources/ts/popups/ns-pos-cash-registers-action-popup.vue

@@ -45,13 +45,14 @@ export default {
             });
         },
 
-        async closeCashRegister() {
+        async closeCashRegister( register ) {
             try {
                 const response  =   await new Promise( ( resolve, reject ) => {
                     Popup.show( nsPosCashRegistersActionPopupVue, {
                         title: __( 'Close Register' ),
                         action: 'close',
                         identifier: 'ns.cash-registers-closing',
+                        register,
                         resolve, 
                         reject
                     })
@@ -158,7 +159,7 @@ export default {
             </div>
         </div>
         <div class="grid grid-cols-2 text-gray-700">
-            <div @click="closeCashRegister()" class="hover:bg-teal-100 border-gray-200 border-r border-b py-4 cursor-pointer px-2 flex items-center justify-center flex-col">
+            <div @click="closeCashRegister( register )" class="hover:bg-teal-100 border-gray-200 border-r border-b py-4 cursor-pointer px-2 flex items-center justify-center flex-col">
                 <i class="las la-sign-out-alt text-6xl"></i>
                 <h3 class="text-xl font-bold">{{ __( 'Close' ) }}</h3>
             </div>

resources/ts/popups/ns-pos-cash-registers-options-popup.vue

@@ -27,4 +27,15 @@ public function testCreateCoupon()
         $this->attemptAuthenticate();
         $this->attemptCreatecoupon();
     }
+
+    /**
+     * Let's now try to update the coupon.
+     * 
+     * @return void
+     */
+    public function testUpdateCoupon()
+    {
+        $this->attemptAuthenticate();
+        $this->attemptUpdateCoupon();
+    }
 }

tests/Feature/CreateCouponTest.php

@@ -1,7 +1,9 @@
 <?php
 namespace Tests\Traits;
 
+use App\Models\Coupon;
 use App\Models\Product;
+use App\Models\ProductCategory;
 use Illuminate\Foundation\Testing\WithFaker;
 
 trait WithCouponTest
@@ -26,7 +28,43 @@ protected function attemptCreatecoupon()
                         ->toArray()
                 ],
                 'selected_categories'   =>  [
-                    'categories'        =>    Product::select( 'id' )
+                    'categories'        =>    ProductCategory::select( 'id' )
+                        ->get()
+                        ->map( fn( $product ) => $product->id )
+                        ->toArray()
+                ]
+            ]);
+
+        $response->assertJsonPath( 'status', 'success' );
+    }
+
+    protected function attemptUpdateCoupon()
+    {
+        /**
+         * just in case the function executes before 
+         * the coupon creation.
+         */
+        $this->attemptCreatecoupon();
+        
+        $coupon         =   Coupon::first();
+
+        $response       =   $this->withSession( $this->app[ 'session' ]->all() )
+            ->json( 'put', 'api/nexopos/v4/crud/ns.coupons/' . $coupon->id, [
+                'name'          =>  $this->faker->name,
+                'general'       =>  [
+                    'type'              =>  'percentage_discount',
+                    'code'              =>  'cp-' . $this->faker->numberBetween(0,9) . $this->faker->numberBetween(0,9),
+                    'discount_value'    =>  $this->faker->randomElement([ 10, 15, 20, 25 ]),
+                    'limit_usage'       =>  $this->faker->randomElement([ 100, 200, 400 ]),        
+                ],
+                'selected_products'     =>  [
+                    'products'          =>  Product::select( 'id' )
+                        ->get()
+                        ->map( fn( $product ) => $product->id )
+                        ->toArray()
+                ],
+                'selected_categories'   =>  [
+                    'categories'        =>    ProductCategory::select( 'id' )
                         ->get()
                         ->map( fn( $product ) => $product->id )
                         ->toArray()