update certain file

app/Http/Controllers/DS/DealerClaimController.php

@@ -18,6 +18,7 @@ use App\Model\Subscriber;
 use App\Model\WorkOrder;
 use App\Model\Docket;
 use App\Model\DealerClaim;
+use App\Model\DealerClaim2;
 use App\Model\Product;
 
 class DealerClaimController extends Controller
@@ -75,12 +76,76 @@ class DealerClaimController extends Controller
 		return $notExist;
 	}
 
+	public function getCompleted2(){
+
+		$cdata = array(); $finalData = array();
+
+		$dealerclaim = DealerClaim2::get()->toArray();
+
+		$form = Form::with('Subscriber','PackageDetail','WorkOrder')->get();
+		foreach($form as $f){
+			if(!empty($f->dealer_id)){
+				if(!empty($f->WorkOrder)){
+					if($f->WorkOrder->status == 'Completed' && $f->WorkOrder->nature_work == 'Activation'){
+						$cdata[] = $f->_id;
+					}
+				}
+			}
+		}
+
+		$notExist = array();
+		foreach($cdata as $c){
+			if(array_search($c, array_column($dealerclaim, 'customer_id')) !== False) {
+			} else {
+				$notExist[] = $c;
+
+				$formD = Form::with('Subscriber','PackageDetail','WorkOrder')->where('_id',$c)->first();
+				$product = Product::where('speed', $formD->PackageDetail->name)->where('formT',$formD->type_application)->withTrashed()->first();
+				$docket = Docket::where('work_order_id',$formD->WorkOrder->wo)->first();
+
+				if(!empty($docket->docket_id)){
+					$subsData = [
+						'formT' => $formD->type_application,
+						'contract' => $formD->PackageDetail->contract,
+						'submission_dt' => Carbon::parse($formD->created_at)->setTimezone('Asia/Kuala_Lumpur')->toDateTimeString(),
+						'submission_my' => date('m/Y', strtotime(Carbon::parse($formD->created_at)->setTimezone('Asia/Kuala_Lumpur'))),
+						'wo' => $formD->WorkOrder->wo,
+						'customer_id' => $formD->_id,
+						'package' => $formD->PackageDetail->name,
+						'retail_price' => (int)$product->retail_price,
+						'docket' => $docket->docket_id,
+						'activated_dt' => $docket->end_job,
+						'activated_my' => date('m/Y', strtotime($docket->end_job)),
+						'claim_dt' => '',
+						'total_form_by_month' => '',
+						'agent' => $formD->dealer_id,
+						'dealer' => $formD->company_id,
+					];
+
+					DealerClaim2::create($subsData);
+				}
+			}
+		}
+		return $notExist;
+	}
+
 	public function storeDealerClaim(){
 
 		$data = $this->getCompleted();
 		return $data;
 	}
 
+	public function storeDealerClaim2(){
+
+		$data = $this->getCompleted2();
+		return $data;
+	}
+
+	public function getDealerCompany2(){
+		$dataD = $this->storeDealerClaim2();
+		dd($dataD);
+	} 
+
 
 	public function test1(){
 		$d = DealerClaim::where('formT' == 'R')->all();

app/Http/Controllers/DS/DealerController.php

@@ -517,6 +517,16 @@ class DealerController extends Controller
 						    $count_jasin[] = $d;
 						}
 
+					}else if(date('d/m/Y', strtotime($d['activation'])) >= '27/4/2020' && date('d/m/Y', strtotime($d['activation'])) <= '31/7/2020'){
+
+						if (strpos($d['address'], 'Cyberjaya') !== false) {
+						    $count_cyberjaya[] = $d;
+						}
+
+						if (strpos($d['address'], 'Jasin') !== false) {
+						    $count_jasin[] = $d;
+						}
+
 					}else {
 						if(date('n/Y', strtotime($d['activation'])) == $month.'/'.$year){
 							$combineData[] = $d;
@@ -685,6 +695,16 @@ class DealerController extends Controller
 					$balance = count($count_jasin) - 10;
 					$extra += $balance * 50;
 				}
+			}else if(($month == '4' || $month == '5'|| $month == '6' || $month == '7') && $year == '2020'){
+				if(count($count_cyberjaya) > 50){
+					$balance = count($count_cyberjaya) - 50;
+					$extra += $balance * 50;
+				}
+
+				if(count($count_jasin) > 20){
+					$balance = count($count_jasin) - 10;
+					$extra += $balance * 50;
+				}
 			}else {
 				$extra = 0;
 			}
@@ -718,6 +738,16 @@ class DealerController extends Controller
 							    $count_jasin[] = $d;
 							}
 
+						}else if(date('d/m/Y', strtotime($d['activation'])) >= '27/4/2020' && date('d/m/Y', strtotime($d['activation'])) <= '31/7/2020'){
+
+							if (strpos($d['address'], 'Cyberjaya') !== false) {
+								$count_cyberjaya[] = $d;
+							}
+
+							if (strpos($d['address'], 'Jasin') !== false) {
+								$count_jasin[] = $d;
+							}
+
 						}else {
 							if(date('n/Y', strtotime($d['activation'])) == $month.'/'.$year){
 								$combineData[] = $d;
@@ -886,6 +916,16 @@ class DealerController extends Controller
 					$balance = count($count_jasin) - 10;
 					$extra += $balance * 50;
 				}
+			}else if(($month == '4' || $month == '5'|| $month == '6' || $month == '7') && $year == '2020'){
+				if(count($count_cyberjaya) > 50){
+					$balance = count($count_cyberjaya) - 50;
+					$extra += $balance * 50;
+				}
+
+				if(count($count_jasin) > 20){
+					$balance = count($count_jasin) - 10;
+					$extra += $balance * 50;
+				}
 			}else {
 				$extra = 0;
 			}

app/Model/DealerClaim2.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Model;
+
+use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
+use Jenssegers\Mongodb\Eloquent\SoftDeletes;
+
+class DealerClaim2 extends Eloquent {
+    //
+
+    use SoftDeletes;
+    
+	protected $connection = 'mongodb';
+    protected $collection = 'dealer_claim2';
+	
+	protected $guarded = ['_id'];
+
+
+}

resources/views/customer-service/confirm_work_order.blade.php

@@ -124,6 +124,7 @@
 								<option value="DLink AC1200" <?php if($form->WorkOrder->router == "DLink AC1200") { echo "selected"; } ?>>DLink AC1200</option>
 								<option value="Tenda AP4 Wireless & AP" <?php if($form->WorkOrder->router == "Tenda AP4 Wireless & AP") { echo "selected"; } ?>>Tenda AP4 Wireless & AP</option>
 								<option value="Cisco AC1200" <?php if($form->WorkOrder->router == "Cisco AC1200") { echo "selected"; } ?>>Cisco AC1200</option>
+								<option value="TPLink AC1200" <?php if($form->WorkOrder->router == "TPLink AC1200") { echo "selected"; } ?>>TPLink AC1200</option>
 								<option value="N/A" <?php if($form->WorkOrder->router == "N/A") { echo "selected"; } ?>>N/A</option>
 							</select>
 						</span>

resources/views/customer-service/edit_work_order.blade.php

@@ -124,6 +124,7 @@
 								<option value="DLink AC1200" <?php if($form->WorkOrder->router == "DLink AC1200") { echo "selected"; } ?>>DLink AC1200</option>
 								<option value="Tenda AP4 Wireless & AP" <?php if($form->WorkOrder->router == "Tenda AP4 Wireless & AP") { echo "selected"; } ?>>Tenda AP4 Wireless & AP</option>
 								<option value="Cisco AC1200" <?php if($form->WorkOrder->router == "Cisco AC1200") { echo "selected"; } ?>>Cisco AC1200</option>
+								<option value="TPLink AC1200" <?php if($form->WorkOrder->router == "TPLink AC1200") { echo "selected"; } ?>>TPLink AC1200</option>
 								<option value="N/A" <?php if($form->WorkOrder->router == "N/A") { echo "selected"; } ?>>N/A</option>
 							</select>
 						</span>

resources/views/customer-service/view_wo_edit_resident.blade.php

@@ -82,6 +82,7 @@
 								<option value="">Choose Router</option>
 								<option value="Tenda AC1200" >Tenda AC1200</option>
 								<option value="Cisco AC1200" >Cisco AC1200</option>
+								<option value="TPLink AC1200" >TPLink AC1200</option>
 								<option value="N/A" selected>N/A</option>
 							</select>
 						</span>

resources/views/sales/form/business_package.blade.php

@@ -424,8 +424,7 @@
 				$(function() {
 					$('#sDate').datepicker({
 						format: 'dd-mm-yyyy',
-						// startDate: '+3d',
-						startDate: '29/04/2020',
+						startDate: '+3d',
 						daysOfWeekDisabled: "0,6"
 					});
 				});

resources/views/sales/form/dealer/business_package.blade.php

@@ -425,8 +425,7 @@
 		$(function() {
 			$('#sDate').datepicker({
 				format: 'dd-mm-yyyy',
-				// startDate: '+3d',
-				startDate: '29/04/2020',
+				startDate: '+3d',
 				daysOfWeekDisabled: "0,6"
 			});
 		});

resources/views/sales/form/dealer/residential_package.blade.php

@@ -402,8 +402,7 @@
 		$(function() {
 			$('#sDate').datepicker({
 				format: 'dd-mm-yyyy',
-				// startDate: '+3d',
-				startDate: '29/04/2020',
+				startDate: '+3d',
 				daysOfWeekDisabled: "0,6"
 			});
 		});

resources/views/sales/form/residential_package.blade.php

@@ -403,8 +403,7 @@
 				$(function() {
 					$('#sDate').datepicker({
 						format: 'dd-mm-yyyy',
-						// startDate: '+3d',
-						startDate: '29/04/2020',
+						startDate: '+3d',
 						daysOfWeekDisabled: "0,6"
 					});
 				});

routes/web.php

@@ -198,6 +198,7 @@ Route::group(['middleware' => 'contractorAuth'], function() {
 
 
 Route::get('/store/dealer/claim', 'DS\DealerClaimController@getDealerCompany');
+Route::get('/store/dealer/claim2', 'DS\DealerClaimController@getDealerCompany2');
 Route::get('/get/dealer/claim/special', 'DS\DealerClaimController@updateIncentives');
 
 Route::get('/dbOld/convert-laravel', ['uses' => 'DS\TestController@convertStaffDb']);