From c2d93d9ae061c680bc1dcde4d60745ef2fe70c11 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Mon, 13 Aug 2018 16:13:54 +0800 Subject: [PATCH 1/6] fix phpmyadmin network error --- caddy/Dockerfile | 2 +- docker-prod.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/caddy/Dockerfile b/caddy/Dockerfile index a3d56f68..a36b4ea1 100644 --- a/caddy/Dockerfile +++ b/caddy/Dockerfile @@ -13,7 +13,7 @@ RUN curl --silent --show-error --fail --location \ COPY Caddyfile /etc/Caddyfile WORKDIR /var/www -RUN mkdir -f /var/www/public/storage +RUN mkdir -p /var/www/public/storage RUN ln -sf /var/www/storage/app/public /var/www/public/storage CMD ["/usr/bin/caddy", "--conf", "/etc/Caddyfile", "--log", "stdout"] \ No newline at end of file diff --git a/docker-prod.yml b/docker-prod.yml index 889ab43d..7295a0f6 100644 --- a/docker-prod.yml +++ b/docker-prod.yml @@ -77,6 +77,9 @@ services: environment: PMA_HOST: mysql MYSQL_ROOT_PASSWORD: root + networks: + - frontend + - backend volumes: dbdata: \ No newline at end of file From 1201107b22a15074323467816f1b6e440dbe1409 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Mon, 13 Aug 2018 16:20:07 +0800 Subject: [PATCH 2/6] drop billing_amount column in supplier booking --- ...253_drop_eta_in_china_bank_slips_table.php | 3 -- ...ve_billing_amount_in_supplier_bookings.php | 30 +++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 database/migrations/2018_08_13_161906_remove_billing_amount_in_supplier_bookings.php diff --git a/database/migrations/2018_08_13_121253_drop_eta_in_china_bank_slips_table.php b/database/migrations/2018_08_13_121253_drop_eta_in_china_bank_slips_table.php index 4ceef06c..61814d4e 100644 --- a/database/migrations/2018_08_13_121253_drop_eta_in_china_bank_slips_table.php +++ b/database/migrations/2018_08_13_121253_drop_eta_in_china_bank_slips_table.php @@ -25,8 +25,5 @@ class DropEtaInChinaBankSlipsTable extends Migration */ public function down() { - Schema::table('china_bank_slips', function (Blueprint $table) { - // - }); } } diff --git a/database/migrations/2018_08_13_161906_remove_billing_amount_in_supplier_bookings.php b/database/migrations/2018_08_13_161906_remove_billing_amount_in_supplier_bookings.php new file mode 100644 index 00000000..55f0b542 --- /dev/null +++ b/database/migrations/2018_08_13_161906_remove_billing_amount_in_supplier_bookings.php @@ -0,0 +1,30 @@ +dropColumn('billing_amount'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} From e55b3b9300e04fbf13686a06b9d2ca2c235c2d16 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Mon, 13 Aug 2018 16:22:45 +0800 Subject: [PATCH 3/6] fix supplier booking error --- ..._bank_branch_in_china_bank_slips_table.php | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 database/migrations/2018_08_13_162215_dropcolumn_bank_branch_in_china_bank_slips_table.php diff --git a/database/migrations/2018_08_13_162215_dropcolumn_bank_branch_in_china_bank_slips_table.php b/database/migrations/2018_08_13_162215_dropcolumn_bank_branch_in_china_bank_slips_table.php new file mode 100644 index 00000000..4f0dbe94 --- /dev/null +++ b/database/migrations/2018_08_13_162215_dropcolumn_bank_branch_in_china_bank_slips_table.php @@ -0,0 +1,32 @@ +dropColumn('bank_branch'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('china_bank_slips', function (Blueprint $table) { + // + }); + } +} From 651690d27558c331f0947dceba4c5cb1d8d667ee Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Mon, 13 Aug 2018 16:25:51 +0800 Subject: [PATCH 4/6] fix bank branch error --- .../Controllers/ChinaBankSlipController.php | 1 - ..._bank_branch_in_china_bank_slips_table.php | 32 ------------------- 2 files changed, 33 deletions(-) delete mode 100644 database/migrations/2018_08_13_162215_dropcolumn_bank_branch_in_china_bank_slips_table.php diff --git a/app/Http/Controllers/ChinaBankSlipController.php b/app/Http/Controllers/ChinaBankSlipController.php index 4684fd04..0ed406ed 100644 --- a/app/Http/Controllers/ChinaBankSlipController.php +++ b/app/Http/Controllers/ChinaBankSlipController.php @@ -56,7 +56,6 @@ class ChinaBankSlipController extends Controller } $china_bankslip = new ChinaBankSlip; - $china_bankslip->bank_branch = '-'; $china_bankslip->booking_id = $booking->id; $china_bankslip->china_bank_slip_path = $upload_path; $china_bankslip->save(); diff --git a/database/migrations/2018_08_13_162215_dropcolumn_bank_branch_in_china_bank_slips_table.php b/database/migrations/2018_08_13_162215_dropcolumn_bank_branch_in_china_bank_slips_table.php deleted file mode 100644 index 4f0dbe94..00000000 --- a/database/migrations/2018_08_13_162215_dropcolumn_bank_branch_in_china_bank_slips_table.php +++ /dev/null @@ -1,32 +0,0 @@ -dropColumn('bank_branch'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('china_bank_slips', function (Blueprint $table) { - // - }); - } -} From b07c44324aec6226d7123fb606b3f2b5b41bfab3 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Mon, 13 Aug 2018 16:30:55 +0800 Subject: [PATCH 5/6] fix bank_branch error --- ..._bank_branch_in_china_bank_slips_table.php | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 database/migrations/2018_08_13_162910_dropcolumn_bank_branch_in_china_bank_slips_table.php diff --git a/database/migrations/2018_08_13_162910_dropcolumn_bank_branch_in_china_bank_slips_table.php b/database/migrations/2018_08_13_162910_dropcolumn_bank_branch_in_china_bank_slips_table.php new file mode 100644 index 00000000..c93b456d --- /dev/null +++ b/database/migrations/2018_08_13_162910_dropcolumn_bank_branch_in_china_bank_slips_table.php @@ -0,0 +1,32 @@ +dropColumn('bank_branch'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('china_bank_slips', function (Blueprint $table) { + // + }); + } +} From 0bf62c00dc6aae3554ea7c29319c9dec433b3671 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Mon, 13 Aug 2018 16:33:33 +0800 Subject: [PATCH 6/6] fix admin index table dont show completed --- app/Http/Controllers/BookingController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 5c326195..f506f3f6 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -149,6 +149,7 @@ class BookingController extends Controller public function adminIndex(){ $user = Auth::user(); $bookings = Booking::select('user_id', 'id', 'created_at', 'admin_status', 'rate', 'term', 'amount', 'bia', 'verification_status') + ->where('status', '<', '7') ->orderby('updated_at','desc') ->paginate(10); @@ -217,7 +218,7 @@ class BookingController extends Controller public function adminBookComplete(){ $user = Auth::user(); $bookings = Booking::select('user_id', 'id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status') - ->where('status', '=', '7') + ->where('admin_status', '=', '7') ->orderby('updated_at','desc') ->paginate(10);