Browse Source

fix: :bug: fix #901

Ferks-FK 1 year ago
parent
commit
a471cb4021

+ 8 - 3
app/Http/Controllers/Admin/PaymentController.php

@@ -143,14 +143,19 @@ class PaymentController extends Controller
             $subtotal = $shopProduct->price;
             $subtotal = $shopProduct->price;
 
 
             // Apply Coupon
             // Apply Coupon
-            $isCouponValid = $this->isCouponValid($couponCode, $user, $shopProduct->id);
-            if ($isCouponValid) {
-                $subtotal = $this->applyCoupon($couponCode, $subtotal);
+            if ($couponCode) {
+                if ($this->isCouponValid($couponCode, $user, $shopProduct->id)) {
+                    $subtotal = $this->applyCoupon($couponCode, $subtotal);
+                }
             }
             }
 
 
             // Apply Partner Discount
             // Apply Partner Discount
             $subtotal = $subtotal - ($subtotal * $discount / 100);
             $subtotal = $subtotal - ($subtotal * $discount / 100);
             if ($subtotal <= 0) {
             if ($subtotal <= 0) {
+                if ($couponCode) {
+                    event(new CouponUsedEvent($couponCode));
+                }
+
                 return $this->handleFreeProduct($shopProduct);
                 return $this->handleFreeProduct($shopProduct);
             }
             }
 
 

+ 1 - 1
app/Listeners/UserPayment.php

@@ -49,7 +49,7 @@ class UserPayment
         $shopProduct = $event->shopProduct;
         $shopProduct = $event->shopProduct;
 
 
         // only update user if payment is paid
         // only update user if payment is paid
-        if ($event->payment->status != PaymentStatus::PAID) {
+        if ($event->payment->status != PaymentStatus::PAID->value) {
             return;
             return;
         }
         }