Browse Source

Merge branch 'master' into hajar

ifah
Siti Hajar Ibrahim 5 years ago
parent
commit
3407ae6d71

+ 1
- 1
app/Http/Controllers/Api/FormController.php View File

@@ -94,7 +94,7 @@ class FormController extends BaseController

$dateS = Carbon::createFromFormat('Y-m-d', '2020-01-01');
$start = $dateS->copy()->startOfDay();
$dateE = Carbon::createFromFormat('Y-m-d', '2020-12-31');
$dateE = Carbon::createFromFormat('Y-m-d', '2020-10-31');
$end = $dateE->copy()->endOfDay();

$result = array();

+ 2
- 0
app/Http/Controllers/DS/DealerController.php View File

@@ -849,6 +849,7 @@ class DealerController extends Controller
$nested_data = array();
foreach ($dealer_claimAll as $c){
$customer = Subscriber::with('Form')->where('_id', $c->customer_id)->first();
info($c->customer_id);
$address = '';
if($customer->Form->type_application == 'R'){
if($customer->street != ''){
@@ -2022,6 +2023,7 @@ class DealerController extends Controller
foreach ($dataClaim as $c){

$address = ''; $name = '';
info($c->Subscriber->_id);
if($c->Subscriber->Form->type_application == 'R'){

if($c->Subscriber->street != ''){

Loading…
Cancel
Save