Explorar el Código

edit calculation claim

ifah
Siti Hajar Ibrahim hace 5 años
padre
commit
58f5966faf
Se han modificado 1 ficheros con 4 adiciones y 12 borrados
  1. 4
    12
      app/Http/Controllers/DS/DealerController.php

+ 4
- 12
app/Http/Controllers/DS/DealerController.php Ver fichero

@@ -2786,7 +2786,6 @@ class DealerController extends Controller
if((date('m/Y', strtotime($d['submission'])) == $month.'/'.$year) && date('d/m/Y', strtotime($d['submission'])) >= '11/8/2020'){
$countAugustR[] = $d;
}else {
info ($d['wo'] . ' ' . $d['submission']);
if(date('m/Y', strtotime($d['activation'])) == $month.'/'.$year){
$combineData[] = $d;
}
@@ -2893,11 +2892,8 @@ class DealerController extends Controller
}

foreach ($dataAugustB as $key => $d) {
if(date('m/Y', strtotime($d['submission'])) == $month.'/'.$year){
if(date('d/m/Y', strtotime($d['submission'])) >= '11/8/2020'){
if((date('m/Y', strtotime($d['submission'])) == $month.'/'.$year) && date('d/m/Y', strtotime($d['submission'])) >= '11/8/2020'){
$countAugustB[] = $d;
}
}else {
if(date('m/Y', strtotime($d['activation'])) == $month.'/'.$year){
$combineData[] = $d;
@@ -3011,10 +3007,9 @@ class DealerController extends Controller
}

foreach ($dataSeptemberR as $key => $d) {
if((date('m/Y', strtotime($d['submission'])) == $month.'/'.$year) && date('d/m/Y', strtotime($d['submission'])) >= '11/8/2020'){
if(((date('m/Y', strtotime($d['submission'])) == '8/2020') && (date('d/m/Y', strtotime($d['submission'])) >= '11/8/2020')) || (date('m/Y', strtotime($d['submission'])) == $month.'/'.$year)){
$countSeptemberR[] = $d;
}else {
info ($d['wo'] . ' ' . $d['submission']);
if(date('m/Y', strtotime($d['activation'])) == $month.'/'.$year){
$combineData[] = $d;
}
@@ -3121,11 +3116,8 @@ class DealerController extends Controller
}

foreach ($dataSeptemberB as $key => $d) {
if(date('m/Y', strtotime($d['submission'])) == $month.'/'.$year){
if(date('d/m/Y', strtotime($d['submission'])) >= '11/8/2020'){
$countSeptemberB[] = $d;
}
if(((date('m/Y', strtotime($d['submission'])) == '8/2020') && (date('d/m/Y', strtotime($d['submission'])) >= '11/8/2020')) || (date('m/Y', strtotime($d['submission'])) == $month.'/'.$year)){
$countSeptemberB[] = $d;
}else {
if(date('m/Y', strtotime($d['activation'])) == $month.'/'.$year){
$combineData[] = $d;

Cargando…
Cancelar
Guardar