Merge branch 'fix/slice-error' into 'master'

Fix/slice error

See merge request CIEFWorldwideSdnBhd/exchange!117

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);
 

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();

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"]

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) {
-            //
-        });
     }
 }

database/migrations/2018_08_13_161906_remove_billing_amount_in_supplier_bookings.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class RemoveBillingAmountInSupplierBookings extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('supplier_bookings', function (Blueprint $table) {
+            $table->dropColumn('billing_amount');    
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

database/migrations/2018_08_13_162910_dropcolumn_bank_branch_in_china_bank_slips_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DropcolumnBankBranchInChinaBankSlipsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('china_bank_slips', function (Blueprint $table) {
+            $table->dropColumn('bank_branch');    
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('china_bank_slips', function (Blueprint $table) {
+            //
+        });
+    }
+}

docker-prod.yml

@@ -77,6 +77,9 @@ services:
     environment:
       PMA_HOST: mysql
       MYSQL_ROOT_PASSWORD: root
+    networks:
+      - frontend
+      - backend
 
 volumes:
   dbdata: