cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-21 13:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/download-report

Browse Source
This commit is contained in:
Mohd Arief
2018-08-24 09:09:49 +08:00
parent 5a78eed4aa da55ae0c3d
commit abc48ed6a4
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BookingController.php
+16 -16
View File
@@ -22,30 +22,30 @@ class BookingController extends Controller
{
public function index(){
\DB::connection()->enableQueryLog();
$user = Auth::user();
$bookings = Booking::select('user_id', 'id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status')
->where('user_id', Auth::user()->id)
->where(function ($query) {
$query->where('status', '<', '5')
->where(function ($query) {
$query->where('term', '=', 'x2_cheque')
->orwhere('term', '=', 'x2_ba')
->orwhere('term', '=', 'x2_cash');
});
})
->orwhere(function ($query) {
$query->where('status', '<', '7')
$query->where(function($query){
$query->where('status', '<', '5')
->where(function ($query) {
$query->where('term', '=', 'x1_cheque')
->orwhere('term', '=', 'x1_ba')
->orwhere('term', '=', 'x1_cash');
});
$query->where('term', '=', 'x2_cheque')
->orwhere('term', '=', 'x2_ba')
->orwhere('term', '=', 'x2_cash');
});
})
->orwhere(function ($query) {
$query->where('status', '<', '7')
->where(function ($query) {
$query->where('term', '=', 'x1_cheque')
->orwhere('term', '=', 'x1_ba')
->orwhere('term', '=', 'x1_cash');
});
});
})
->orderby('updated_at','desc')
->paginate(10);
$queries = \DB::getQueryLog();
//return print_r($queries);
// reformat to fit frontend structure
foreach ($bookings as $booking) {
// set timeout
resources/assets/js/pages/settings/admin-bank-setting.vue
+2 -2
View File
@@ -75,7 +75,7 @@ export default {
this.options_CIEF = malaysiaBankData.map(function(item){
return {
value : item.id,
label : item.company_name + " - " + item.acc_no,
label : item.company_name + " : " + item.bank_name + " : " + item.acc_no,
};
});
})
@@ -97,7 +97,7 @@ export default {
this.options_china_bank = chinaBankData.map(function(item){
return {
value : item.id,
label : item.company_name + " - " + item.acc_no,
label : item.company_name + " : " + item.bank_name + " : " + item.acc_no,
};
});
this.options_china_bank.unshift({