Haina
/
information-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/new-merge-payment'

Browse Source
mobile-first
lyt 5 years ago
parent 9b304ce94b 49a0d08bee
commit bd3a95c3ec
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

10
webht/third_party/pay/controllers/PaymentService.php vendored
Unescape Escape View File

@ -765,21 +765,21 @@ class PaymentService extends CI_Controller {
// $data['from_date'] = date("Y-m-d", strtotime("-8 days")); // $data['from_date'] = date("Y-m-d", strtotime("-8 days"));
// $data['to_date'] = date("Y-m-d", strtotime("-1 days")); // $data['to_date'] = date("Y-m-d", strtotime("-1 days"));
$data['from_date'] = date("Y-m-01", strtotime("-1 month")); $data['from_date'] = date("Y-m-01", strtotime("-1 month"));
$data['to_date'] = date("Y-m-01"); $data['to_date'] = date("Y-m-01 23:59:59");
} else { } else {
$data['from_date'] = $date_range_arr[0][0]; $data['from_date'] = $date_range_arr[0][0];
$data['to_date'] =$date_range_arr[0][1] . " 23:59:59"; $data['to_date'] =$date_range_arr[0][1] . " 23:59:59";
if ($data['to_date'] == null) { if ($data['to_date'] == null) {
$data['to_date'] = date("Y-m-d H:i:s", strtotime("+1 month", strtotime($data['from_date']))-1); $data['to_date'] = date("Y-m-d 23:59:59", strtotime("+1 month", strtotime($data['from_date']))-1);
} }
} }
$data['at_year'] = date('Y-01-01', strtotime($data['to_date'])); $data['at_year'] = date('Y-01-01', strtotime($data['to_date']));
$data['day_cnt'] = calc_day_cnt($data['from_date'], $data['to_date']); $data['day_cnt'] = calc_day_cnt($data['from_date'], $data['to_date'])+1;
$data['from_date_quarter'] = date('Y-m-d', strtotime("-" . $data['day_cnt'] . " days ", strtotime($data['from_date']))); $data['from_date_quarter'] = date('Y-m-d', strtotime("-" . $data['day_cnt'] . " days ", strtotime($data['from_date'])));
$data['to_date_quarter'] = date('Y-m-d', strtotime("-" . $data['day_cnt'] . " days ", strtotime($data['to_date']))); $data['to_date_quarter'] = date('Y-m-d 23:59:59', strtotime("-" . $data['day_cnt'] . " days ", strtotime($data['to_date'])));
$data['from_date_year'] = date('Y-m-d', strtotime("-1 year ", strtotime($data['from_date']))); $data['from_date_year'] = date('Y-m-d', strtotime("-1 year ", strtotime($data['from_date'])));
$data['to_date_year'] = date('Y-m-d', strtotime("-1 year ", strtotime($data['to_date']))); $data['to_date_year'] = date('Y-m-d 23:59:59', strtotime("-1 year ", strtotime($data['to_date'])));
$data['data']['pay'] = $this->note_model->total_by_method('pay', $data['data']['pay'] = $this->note_model->total_by_method('pay',
$data['from_date'], $data['to_date'], $data['from_date'], $data['to_date'],

Write Preview
Loading…
Cancel
Save