diff --git a/database/seeds/FakeBookingTransactions.php b/database/seeds/FakeBookingTransactions.php index 98d42b45..08ff95f7 100644 --- a/database/seeds/FakeBookingTransactions.php +++ b/database/seeds/FakeBookingTransactions.php @@ -130,12 +130,13 @@ class FakeBookingTransactions extends Seeder $bank_ids[$added->id][] = $added_bank->id; } + //Model employee have issue: Unknown column 'updated_at' in 'field list' DB::table('employees')->updateOrInsert( ['company_id' => $added->id, 'user_id' => $user_id, 'status' => 2], ['company_id' => $added->id, 'user_id' => $user_id, 'status' => 2] ); - DB::table('documents')->updateOrInsert( + Models\Document::updateOrCreate( ['owner_id' => $added->id, 'status' => 2], [ 'owner_type' => 'App\Models\Company', @@ -145,6 +146,11 @@ class FakeBookingTransactions extends Seeder 'reference' => $company['reference'], ] ); + + Models\SegmentCompany::updateOrCreate( + ['company_id' => $added->id, 'segment_id' => 1], + ['company_id' => $added->id, 'segment_id' => 1] + ); } @@ -195,25 +201,25 @@ class FakeBookingTransactions extends Seeder 'transaction_id' => null, //fill-up later 'product_code' => 'MBP15', 'product_name' => 'Macbook Pro 15"', - 'quantity' => 3, + 'quantity' => 2, 'price' => 1000, - 'amount' => 3000, + 'amount' => 2000, ], [ 'transaction_id' => null, //fill-up later 'product_code' => 'IP12', 'product_name' => 'iPad Pro 12"', - 'quantity' => 3, + 'quantity' => 2, 'price' => 1000, - 'amount' => 3000, + 'amount' => 2000, ], [ 'transaction_id' => null, //fill-up later 'product_code' => 'IMC24', 'product_name' => 'iMac', - 'quantity' => 3, + 'quantity' => 2, 'price' => 1000, - 'amount' => 3000, + 'amount' => 2000, ], ]; @@ -240,7 +246,8 @@ class FakeBookingTransactions extends Seeder $booking['company_id'] = $company_id; $booking['bank_id'] = $bank_ids[$company_id][0]; $booking['marking'] = $marking; - $booking['fix_amount'] = 1000; + $fix_amount = [4000,8000]; + $booking['fix_amount'] = $fix_amount[array_rand($fix_amount)];; $booking['created_at'] = date('Y-m-d H:i:s'); $booking['updated_at'] = date('Y-m-d H:i:s'); @@ -251,15 +258,15 @@ class FakeBookingTransactions extends Seeder foreach ($transactions as $transaction) { - $bill_no = $code = mt_rand(100000001, 999999999);; + $bill_no = $code = mt_rand(100000001, 999999999); $transaction['booking_id'] = $booking_id; $transaction['type'] = $transaction_type; $transaction['issuer'] = $company_id; $transaction['bill_no'] = $bill_no; - $transaction['amount'] = 3000; - $transaction['original_amount'] = 3000; + $transaction['amount'] = 6000; + $transaction['original_amount'] = 6000; $transaction['created_at'] = date('Y-m-d H:i:s'); $transaction['updated_at'] = date('Y-m-d H:i:s'); diff --git a/resources/assets/vue/components/bookings/sections/BookingMergeSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingMergeSectionComponent.vue index 9dfbd0e4..65abfab2 100644 --- a/resources/assets/vue/components/bookings/sections/BookingMergeSectionComponent.vue +++ b/resources/assets/vue/components/bookings/sections/BookingMergeSectionComponent.vue @@ -127,7 +127,7 @@