fix calculation claim

app/Http/Controllers/Controller.php

@@ -101,7 +101,7 @@ class Controller extends BaseController
 
     public function deleteTodayClaim()
     {
-        $claim = DealerClaim::where('activated_my', '12/2020')->get();
+        $claim = DealerClaim::where('activated_my', '12/2020')->orWhere('activated_my','11/2020')->get();
 
         foreach ($claim as $key => $c) {
             # code...

app/Http/Controllers/DS/DealerClaimController.php

@@ -50,8 +50,12 @@ class DealerClaimController extends Controller
 				$product = Product::where('speed', $formD->PackageDetail->name)->where('formT',$formD->type_application)->first();
 				$docket = Docket::where('work_order_id',$formD->WorkOrder->wo)->first();
 
-				if(date('m/Y', strtotime(Carbon::parse($formD->created_at)->setTimezone('Asia/Kuala_Lumpur'))) == '12/2020'){
-					$price = (int)$product->promotion_price;
+				if(date('m/Y', strtotime(Carbon::parse($formD->created_at)->setTimezone('Asia/Kuala_Lumpur'))) == '10/2020' || date('m/Y', strtotime(Carbon::parse($formD->created_at)->setTimezone('Asia/Kuala_Lumpur'))) == '12/2020'){
+					if($formD->PackageDetail->name != '1' || $formD->PackageDetail->contract != '12' ){
+						$price = (int)$product->promotion_price;
+					}else{
+						$price = (int)$product->retail_price;
+					}
 				} else {
 					$price = (int)$product->retail_price;
 				}