diff --git a/app/Booking.php b/app/Booking.php new file mode 100644 index 00000000..c63969cc --- /dev/null +++ b/app/Booking.php @@ -0,0 +1,57 @@ +belongsTo('app\User'); + } + + public function supplierBooking(){ + return $this->hasOne(SupplierBooking::class); + } + + public function chinaBankSlip(){ + return $this->hasOne(ChinaBankSlip::class); + } + + public function userBankSlip(){ + return $this->hasOne(UserBankSlip::class); + } + + public function purchaseOrder(){ + return $this->hasOne(PurchaseOrder::class); + } + + public function invoice(){ + return $this->hasOne(Invoice::class); + } + + +} + diff --git a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue new file mode 100644 index 00000000..385cf529 --- /dev/null +++ b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue @@ -0,0 +1,390 @@ + + + \ No newline at end of file diff --git a/resources/assets/js/pages/admin/booking/uploadInvoice.vue b/resources/assets/js/pages/admin/booking/uploadInvoice.vue new file mode 100644 index 00000000..61a54f43 --- /dev/null +++ b/resources/assets/js/pages/admin/booking/uploadInvoice.vue @@ -0,0 +1,365 @@ + + + \ No newline at end of file diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index cc35045c..df7a5e29 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,11 @@ namespace Composer\Autoload; +<<<<<<< HEAD class ComposerStaticInit0bbff1eca0c8c05eacbd8478d22c7dd2 +======= +class ComposerStaticInite450fcd5b0627496bb38e1386c9a81ad +>>>>>>> b8fd5d08c479289561ba076e2fb2e795c9e29efb { public static $files = array ( '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php', @@ -18,9 +22,9 @@ class ComposerStaticInit0bbff1eca0c8c05eacbd8478d22c7dd2 '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php', '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php', 'bd9634f2d41831496de0d3dfe4c94881' => __DIR__ . '/..' . '/symfony/polyfill-php56/bootstrap.php', + '801c31d8ed748cfa537fa45402288c95' => __DIR__ . '/..' . '/psy/psysh/src/functions.php', 'f0906e6318348a765ffb6eb24e0d0938' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/helpers.php', '58571171fd5812e6e447dce228f52f4d' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/helpers.php', - '801c31d8ed748cfa537fa45402288c95' => __DIR__ . '/..' . '/psy/psysh/src/functions.php', 'f18cc91337d49233e5754e93f3ed9ec3' => __DIR__ . '/..' . '/laravelcollective/html/src/helpers.php', ); @@ -4766,10 +4770,17 @@ class ComposerStaticInit0bbff1eca0c8c05eacbd8478d22c7dd2 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { +<<<<<<< HEAD $loader->prefixLengthsPsr4 = ComposerStaticInit0bbff1eca0c8c05eacbd8478d22c7dd2::$prefixLengthsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInit0bbff1eca0c8c05eacbd8478d22c7dd2::$prefixDirsPsr4; $loader->prefixesPsr0 = ComposerStaticInit0bbff1eca0c8c05eacbd8478d22c7dd2::$prefixesPsr0; $loader->classMap = ComposerStaticInit0bbff1eca0c8c05eacbd8478d22c7dd2::$classMap; +======= + $loader->prefixLengthsPsr4 = ComposerStaticInite450fcd5b0627496bb38e1386c9a81ad::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInite450fcd5b0627496bb38e1386c9a81ad::$prefixDirsPsr4; + $loader->prefixesPsr0 = ComposerStaticInite450fcd5b0627496bb38e1386c9a81ad::$prefixesPsr0; + $loader->classMap = ComposerStaticInite450fcd5b0627496bb38e1386c9a81ad::$classMap; +>>>>>>> b8fd5d08c479289561ba076e2fb2e795c9e29efb }, null, ClassLoader::class); }