Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/suppliersetting

app/Http/Controllers/BookingController.php

@@ -22,6 +22,7 @@ class BookingController extends Controller
 		$user = Auth::user();
         $bookings = Booking::select('id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status')
                                     ->where('user_id', $user->id)
+                                    ->orderby('updated_at','desc')
                                     ->paginate(10);
 
 
@@ -77,7 +78,8 @@ class BookingController extends Controller
 	public function adminIndex(){
 		$user = Auth::user(); 
 		$bookings = Booking::select('id', 'created_at', 'admin_status', 'rate', 'term', 'amount', 'bia', 'verification_status')
-		->get();
+        ->orderby('updated_at','desc')
+        ->get();
 
 			// reformat to fit frontend structure 
 			foreach ($bookings as $booking) {
@@ -524,6 +526,16 @@ class BookingController extends Controller
         $term = $request->input('term');
         $china_beneficiary = $request->input('china_beneficiary');
         $rates = Rate::orderby('updated_at','desc')->first();
+
+        $creditLimit = SettingCredit::orderby('updated_at','desc')->first();
+
+		if (!$creditLimit){
+			return response()->json("Credit limit not set, please contact admin", 405);
+		}
+
+        if($amount > $creditLimit->rmb_credit_limit){
+            return response()->json(["message" => "Exceed credit limit, please contact our sales team for larger quantitiy"], 400);
+        }
  
         // TODO : get marking 
         $marking = "123X";

database/migrations/2014_10_12_000000_create_users_table.php

@@ -29,7 +29,7 @@ class CreateUsersTable extends Migration
      * @return void
      */
     public function down()
-    {
-        
+    {   
+        Schema::drop('users');
     }
 }

database/migrations/2018_04_25_085705_create_rates_table.php

@@ -32,6 +32,6 @@ class CreateRatesTable extends Migration
      */
     public function down()
     {
-
+        Schema::dropIfExists('rates');
     }
 }

database/migrations/2018_05_15_075453_create_bookings_table.php

@@ -41,8 +41,14 @@ class CreateBookingsTable extends Migration
      * @return void
      */
     public function down()
-    {
+    {   
+        Schema::table('bookings', function(Blueprint $table)
+        {
+            $table->dropForeign('bookings_rate_id_foreign');
+            $table->dropColumn('rate_id');
+        });
 
+        Schema::dropIfExists('bookings');
         
     }
 }

database/migrations/2018_05_15_090646_change_user_id_in_bookings_table.php

@@ -29,6 +29,10 @@ class ChangeUserIdInBookingsTable extends Migration
      */
     public function down()
     {
-
+        Schema::table('bookings', function(Blueprint $table)
+        {
+            $table->dropForeign('bookings_user_id_foreign');
+            $table->dropColumn('user_id');
+        });
     }
 }

database/migrations/2018_05_22_032509_add_bookings_table.php

@@ -28,11 +28,7 @@ class AddBookingsTable extends Migration
             $table->string('usd_book_swift_code')->default(' ');
             $table->string('usd_book_cnap')->default(' ');
             $table->string('usd_book_bank_branch')->default(' ');
-            $table->boolean('verification_status')->default('1'); // Results in a default value of 1.
-
-   //         $table->foreign('status_id')
-   //             ->references('id')->on('status')
-   //             ->onDelete('cascade');
+            $table->boolean('verification_status')->default('1'); 
         });
     }
 
@@ -43,8 +39,6 @@ class AddBookingsTable extends Migration
      */
     public function down()
     {
-        Schema::table('bookings', function (Blueprint $table) {
-            //
-        });
+
     }
 }

database/migrations/2018_05_22_032509_make_nullable_field_bookings_table.php

@@ -28,11 +28,7 @@ class MakeNullableFieldBookingsTable extends Migration
             $table->string('usd_book_swift_code')->nullable()->change();
             $table->string('usd_book_cnap')->nullable()->change();
             $table->string('usd_book_bank_branch')->nullable()->change();
-            $table->boolean('verification_status')->nullable()->change(); // Results in a default value of 1.
-
-   //         $table->foreign('status_id')
-   //             ->references('id')->on('status')
-   //             ->onDelete('cascade');
+            $table->boolean('verification_status')->nullable()->change();
         });
     }
 

database/migrations/2018_05_24_082214_create_user_bank_slips_table.php

@@ -34,6 +34,11 @@ class CreateUserBankSlipsTable extends Migration
      */
     public function down()
     {
+        Schema::table('user_bank_slips', function(Blueprint $table)
+        {
+            $table->dropForeign('user_bank_slips_book_id_foreign');
+        });
+
         Schema::dropIfExists('user_bank_slips');
     }
 }

database/migrations/2018_05_28_085925_create_purchase_orders_table.php

@@ -30,6 +30,11 @@ class CreatePurchaseOrdersTable extends Migration
      */
     public function down()
     {
+        Schema::table('purchase_orders', function(Blueprint $table)
+        {
+            $table->dropForeign('purchase_orders_booking_id_foreign');
+            $table->dropColumn('booking_id');
+        });
         Schema::dropIfExists('purchase_orders');
     }
 }

database/migrations/2018_06_19_144347_create_marking_table.php

@@ -28,6 +28,6 @@ class CreateMarkingTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('marking');
+        Schema::dropIfExists('markings');
     }
 }

database/migrations/2018_06_21_040652_create_invoice_table.php

@@ -30,6 +30,12 @@ class CreateInvoiceTable extends Migration
      */
     public function down()
     {
+        Schema::table('invoices', function(Blueprint $table)
+        {
+            $table->dropForeign('invoices_booking_id_foreign');
+            $table->dropColumn('booking_id');
+        });
+
         Schema::dropIfExists('invoices');
     }
 }

database/migrations/2018_06_27_081455_add_bookingid_foreignkey_to_chinabankslip_table.php

@@ -27,6 +27,10 @@ class AddBookingidForeignkeyToChinabankslipTable extends Migration
      */
     public function down()
     {
-        //
+        Schema::table('china_bank_slips', function(Blueprint $table)
+        {
+            $table->dropForeign('china_bank_slips_booking_id_foreign');
+            $table->dropColumn('booking_id');
+        });
     }
 }

resources/assets/js/components/LocaleDropdown.vue

@@ -1,7 +1,7 @@
 <template>
 <div>
   <ul class="nav navbar-nav">
-    <li class="nav-item dropdown">
+    <!-- <li class="nav-item dropdown">
       <a class="nav-link dropdown-toggle" href="#" role="button"
         data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
         {{ locales[locale] }}
@@ -12,7 +12,7 @@
           {{ value }}
         </a>
       </div>
-    </li>
+    </li> -->
     <ul class="navbar-nav mr-auto">
     <li v-if="(user && role == 'admin')" class="nav-item">
       <el-popover placement="top" width="300" v-model="UpdateRatePopoverVisible">
@@ -27,9 +27,9 @@
           <a class="nav-link" href="#" role="button" slot="reference">Update Rate</a>
         </el-popover>
       </li></ul>
-      <li v-if="(user && role == 'admin')" class="nav-item"><router-link :to="{ name: 'admin.complete' }" class="nav-link">{{ $t('Complete Order') }}</router-link></li>
+      <!-- <li v-if="(user && role == 'admin')" class="nav-item"><router-link :to="{ name: 'admin.complete' }" class="nav-link">{{ $t('Complete Order') }}</router-link></li> -->
       <li v-if="(user && role == 'admin')" class="nav-item"><router-link :to="{ name: 'admin.transaction-history' }" class="nav-link">{{ $t('Transaction History') }}</router-link></li>
-      <li v-if="(user && role == 'admin')" class="nav-item"><router-link :to="{ name: 'admin.upload-supplier-bank-slip' }" class="nav-link">{{ $t('Upload Supplier Bank Slip to System') }}</router-link></li>
+      <!-- <li v-if="(user && role == 'admin')" class="nav-item"><router-link :to="{ name: 'admin.upload-supplier-bank-slip' }" class="nav-link">{{ $t('Upload Supplier Bank Slip to System') }}</router-link></li> -->
    
   </ul>
 

resources/assets/js/pages/home.vue

@@ -474,6 +474,12 @@ export default {
               this.dialogFormVisible1 = true
             })
             .catch((error) => {
+              this.$message({
+                  showClose: true,
+                  message: error.response.data.message,
+                  type: 'error',
+                  duration: 10000
+              });
               this.loading = false
               console.log(error)
             })