瀏覽代碼

Merge branch 'master' into hajar

ifah
Siti Hajar Ibrahim 5 年之前
父節點
當前提交
3407ae6d71
共有 2 個檔案被更改,包括 3 行新增1 行删除
  1. 1
    1
      app/Http/Controllers/Api/FormController.php
  2. 2
    0
      app/Http/Controllers/DS/DealerController.php

+ 1
- 1
app/Http/Controllers/Api/FormController.php 查看文件



$dateS = Carbon::createFromFormat('Y-m-d', '2020-01-01'); $dateS = Carbon::createFromFormat('Y-m-d', '2020-01-01');
$start = $dateS->copy()->startOfDay(); $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(); $end = $dateE->copy()->endOfDay();


$result = array(); $result = array();

+ 2
- 0
app/Http/Controllers/DS/DealerController.php 查看文件

$nested_data = array(); $nested_data = array();
foreach ($dealer_claimAll as $c){ foreach ($dealer_claimAll as $c){
$customer = Subscriber::with('Form')->where('_id', $c->customer_id)->first(); $customer = Subscriber::with('Form')->where('_id', $c->customer_id)->first();
info($c->customer_id);
$address = ''; $address = '';
if($customer->Form->type_application == 'R'){ if($customer->Form->type_application == 'R'){
if($customer->street != ''){ if($customer->street != ''){
foreach ($dataClaim as $c){ foreach ($dataClaim as $c){


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


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

Loading…
取消
儲存