Changelog:

- Fixed: reward execution
- Added: test reward system

Author: Blair2004

app/Jobs/ComputeCustomerAccountJob.php

@@ -3,12 +3,10 @@
 namespace App\Jobs;
 
 use App\Events\OrderAfterCreatedEvent;
-use App\Events\OrderAfterPaymentCreatedEvent;
 use App\Events\OrderAfterRefundedEvent;
 use App\Events\OrderAfterUpdatedEvent;
 use App\Events\OrderBeforeDeleteEvent;
 use App\Models\Order;
-use App\Models\OrderPayment;
 use App\Services\CustomerService;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;

app/Models/Customer.php

@@ -25,6 +25,11 @@ public function coupons()
         return $this->hasMany( CustomerCoupon::class, 'customer_id' );
     }
 
+    public function rewards()
+    {
+        return $this->hasMany( CustomerReward::class, 'customer_id' );
+    }
+
     /**
      * define the relationship
      * @return Model\RelationShip

app/Services/CustomerService.php

@@ -373,7 +373,7 @@ public function applyReward( CustomerReward $customerReward, Customer $customer,
          * we'll issue a new coupon and update the customer
          * point counter
          */
-        if ( $customerReward->points - $customerReward->target >= 0 ) {
+        if ( $customerReward->points >= $customerReward->target ) {
             $coupon                             =   $reward->coupon;
 
             if ( $coupon instanceof Coupon ) {

public/css/app.css

@@ -0,0 +1,95 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Models\Customer;
+use App\Models\Product;
+use App\Models\RewardSystem;
+use App\Models\Role;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Foundation\Testing\WithFaker;
+use Laravel\Sanctum\Sanctum;
+use Tests\TestCase;
+
+class TestRewardSystem extends TestCase
+{
+    use WithFaker;
+    
+    /**
+     * A basic feature test example.
+     *
+     * @return void
+     */
+    public function test_reward_system()
+    {
+        Sanctum::actingAs(
+            Role::namespace( 'admin' )->users->first(),
+            ['*']
+        );
+
+        $reward             =   RewardSystem::with( 'rules' )->first();
+        $rules              =   $reward->rules->sortBy( 'reward' )->reverse();
+        $timesForOrders     =   ( $reward->target / $rules->first()->reward );
+
+        $product            =   Product::withStockEnabled()->get()->random();
+        $unit               =   $product->unit_quantities()->where( 'quantity', '>', 0 )->first();
+        $subtotal           =   $unit->sale_price * 5;
+        $shippingFees       =   0;
+
+        $customer           =   Customer::first();
+
+        if ( ! $customer->group->reward instanceof RewardSystem ) {
+            $customer->group->reward_system_id  =   $reward->id;
+            $customer->group->save();
+        }
+
+        $previousCoupons    =   $customer->coupons()->count();
+
+        for( $i = 0; $i < $timesForOrders; $i++ ) {
+            $response   =   $this->withSession( $this->app[ 'session' ]->all() )
+                ->json( 'POST', 'api/nexopos/v4/orders', [
+                    'customer_id'           =>  $customer->id,
+                    'type'                  =>  [ 'identifier' => 'takeaway' ],
+                    // 'discount_type'         =>  'percentage',
+                    // 'discount_percentage'   =>  2.5,
+                    'addresses'             =>  [
+                        'shipping'          =>  [
+                            'name'          =>  'First Name Delivery',
+                            'surname'       =>  'Surname',
+                            'country'       =>  'Cameroon',
+                        ],
+                        'billing'          =>  [
+                            'name'          =>  'EBENE Voundi',
+                            'surname'       =>  'Antony Hervé',
+                            'country'       =>  'United State Seattle',
+                        ]
+                    ],
+                    'subtotal'              =>  $subtotal,
+                    'shipping'              =>  $shippingFees,
+                    'products'              =>  [
+                        [
+                            'product_id'            =>  $product->id,
+                            'quantity'              =>  1,
+                            'unit_price'            =>  $this->faker->numberBetween( $rules->first()->from, $rules->first()->to ),
+                            'unit_quantity_id'      =>  $unit->id,
+                            'custom'                =>  'retail'
+                        ], 
+                    ],
+                    'payments'              =>  [
+                        [
+                            'identifier'    =>  'paypal-payment',
+                            'value'         =>  ns()->currency->define( $subtotal )
+                                ->additionateBy( $shippingFees )
+                                ->getRaw()
+                        ]
+                    ]
+                ]);
+
+            $response->assertStatus( 200 );
+        }
+
+        $currentCoupons    =   $customer->coupons()->count();
+        
+        $this->assertTrue( $previousCoupons < $currentCoupons, __( 'The coupons count has\'nt changed.' ) );
+    }
+}