Merge branch 'feature/tagCustomer' into develop
This commit is contained in:
@@ -187,7 +187,7 @@ class CustomerController
|
||||
}
|
||||
|
||||
$recycle = Util::getParam($request,'recycle', '');
|
||||
if ($recycle == 'recycle') {
|
||||
if ($recycle == 'recycle' || $seas == 'seas') {
|
||||
$query->onlyTrashed();
|
||||
}
|
||||
|
||||
@@ -195,6 +195,9 @@ class CustomerController
|
||||
|
||||
foreach ($data->items() as &$value) {
|
||||
$value = Customer::getCustomer($value, $request);
|
||||
if($seas == 'seas'){
|
||||
$value['seas_time'] = time()-strtotime($value['deleted_at']);
|
||||
}
|
||||
}
|
||||
|
||||
return Util::page($data);
|
||||
|
||||
@@ -84,7 +84,7 @@ class Task
|
||||
];
|
||||
$customer = Customer::where($where)->onlyTrashed()->get();
|
||||
foreach ($customer as $item) {
|
||||
$item->update(['user_id' => 0]);
|
||||
$item->update(['user_id' => 0, 'deleted_at' => time()]);
|
||||
CustomerHis::create([
|
||||
'customer_id' => $item->_id,
|
||||
'user_his' => $item->user_id,
|
||||
@@ -92,7 +92,7 @@ class Task
|
||||
]);
|
||||
}
|
||||
|
||||
Log::info('send high seas start',[time()]);
|
||||
Log::info('send high seas end',[time()]);
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user