hawind/gdoo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

发布2.3测试版

Browse Source
This commit is contained in:
hawind
2021-05-02 05:55:42 +08:00
parent 8732c85312
commit ef8224d20e
83 changed files with 635 additions and 1361 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/macros.php
+1 -9
View File
@@ -158,15 +158,7 @@ Builder::macro('search', function ($search) {
if (strpos($search['field'], '.status') !== false && $value == '-4') {
$this->where($this->from.'.is_close', 1);
}
elseif (strpos($search['field'], 'tax_id') !== false) {
if ($this->from == 'customer_order' || $this->from == 'stock_delivery' || $this->from == 'stock_direct') {
$this->where($search['field'], $value);
} else {
$customer_ids = DB::table('customer_tax')->where('id', $value)->pluck('customer_id');
$this->whereIn($this->from.'.customer_id', $customer_ids);
}
} elseif ($condition == 'between') {
elseif ($condition == 'between') {
$this->whereBetween($search['field'], $value);
} elseif ($search['condition'] == 'date2') {