From fcb2de94530f60eb9cc87b8d69abc86e6ca58f53 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Mon, 7 Feb 2022 14:13:10 +0800
Subject: [PATCH 1/6] remove chinese new year announcement

---
 .../customerDashboardSectionComponent.vue     | 34 -------------------
 1 file changed, 34 deletions(-)

diff --git a/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue b/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
index a67c333f..8d48fc7e 100644
--- a/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
@@ -3,40 +3,6 @@
         <div class="col">
             <div class="row">
                 <div class="col-12 col-md-10 ">
-                    <div class="row m-b-20">
-                        <div class="col">
-                            <div class="row">
-                                <div class="col">
-                                    <div class="row" style="background-image: url('/images/—Pngtree—2019 chinese new year lantern_951828.jpg'); background-size: cover;">
-                                        <div class="col no-padding">
-                                            <div class="text-white text-center p-t-25 p-l-25 p-r-25" style="background-color: rgba(0,0,0,0.4);">
-                                                <div class="row">
-                                                    <div class="col">
-                                                        <div class="row m-b-20">
-                                                            <div class="col">
-                                                                <p class="m-b-0">新年快乐！</p>
-                                                                <p class="m-b-15">CIEF祝您春节快乐，万事如意，财运亨通，虎虎生威！<br>在此想通知您公司复工日期如下 :-</p>
-                                                                <p class="m-b-15 bold">客服团队 ： 2022年2月7日</p>
-                                                                <p class="bold">* 假期期间 Exchange 照常可以下单，人民币复工之后就可以安排汇款</p>
-                                                            </div>
-                                                        </div>
-                                                        <div class="row m-b-20">
-                                                            <div class="col">
-                                                                <p class="m-b-0">Happy Chinese New Year!</p>
-                                                                <p class="m-b-15">CIEF wishes you a successful & prosperous Chinese New Year.. may your business prosper with every opportunity that comes your way. <br>We would like to also update you about our company's operation resume dates as below :-</p>
-                                                                <p class="m-b-15 bold">Customer Service : 07 February 2022</p>
-                                                                <p class="bold">* EXCHANGE bookings can be placed as usual during the holidays , RMB transfers will be arranged after operation resume.</p>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
                     <list-component style="min-height: auto;" section="customerAnnouncements" :emptyListSection=false :endpoint="route('api.announcement.list')" :options="{has_segments:true,is_published:true}">
                         <template slot="list" slot-scope="{data}">
                             <view-announcement-form-component :data="data" section="customerAnnouncements"></view-announcement-form-component>

From a4749406f47380ca47f78d15e48c27cb0ad54475 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Feb 2022 11:15:21 +0800
Subject: [PATCH 2/6] fix $ is not a function bug

---
 .../assets/vue/components/general/forms/SelectableComponent.vue | 2 +-
 resources/views/vendor/js.blade.php                             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/general/forms/SelectableComponent.vue b/resources/assets/vue/components/general/forms/SelectableComponent.vue
index ab0ed0b5..d86c35cc 100644
--- a/resources/assets/vue/components/general/forms/SelectableComponent.vue
+++ b/resources/assets/vue/components/general/forms/SelectableComponent.vue
@@ -34,7 +34,7 @@
                         if(!success){return;}
 
                         let vm = this;
-                        let mappedList = $.map(response.payload.data, function(value){
+                        let mappedList = response.payload.data.map(function(value){
                             let preservedValue = value;
                             return {'id': !isNaN(value[vm.valueColumn]) ? parseInt(value[vm.valueColumn]) : value[vm.valueColumn],
                                 'text': vm.labelColumn.map(function(label){
diff --git a/resources/views/vendor/js.blade.php b/resources/views/vendor/js.blade.php
index 9adee26b..f56b59e4 100644
--- a/resources/views/vendor/js.blade.php
+++ b/resources/views/vendor/js.blade.php
@@ -5,6 +5,7 @@
 	'baseUrl' => url('/'),
 	'routes' => collect(\Route::getRoutes())->mapWithKeys(function ($route) { return [$route->getName() => $route->uri()]; })
 ]) !!};
+    window.$ = window.jQuery = require('jquery');
 </script>
 <script src="{{ asset('js/vendor.js') }}" type="text/javascript"></script>
 <script src="{{mix('vue/app.js')}}"></script>

From 36ff2c3be06be285251747244a797b8fb6533844 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Feb 2022 11:26:38 +0800
Subject: [PATCH 3/6] fix $ is not a function bug

---
 resources/views/vendor/js.blade.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/views/vendor/js.blade.php b/resources/views/vendor/js.blade.php
index f56b59e4..9adee26b 100644
--- a/resources/views/vendor/js.blade.php
+++ b/resources/views/vendor/js.blade.php
@@ -5,7 +5,6 @@
 	'baseUrl' => url('/'),
 	'routes' => collect(\Route::getRoutes())->mapWithKeys(function ($route) { return [$route->getName() => $route->uri()]; })
 ]) !!};
-    window.$ = window.jQuery = require('jquery');
 </script>
 <script src="{{ asset('js/vendor.js') }}" type="text/javascript"></script>
 <script src="{{mix('vue/app.js')}}"></script>

From 2cfeea79cc2c4d8716208fbbdaeb24de8bffbebf Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sun, 13 Feb 2022 14:54:07 +0800
Subject: [PATCH 4/6] fix Supplier delivery order

---
 .../CreateInvoiceTransactionProcessor.php     |  4 ++++
 routes/web.php                                | 20 +++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
index e583eaf9..bb022317 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
@@ -210,6 +210,10 @@ class CreateInvoiceTransactionProcessor
 
         $booking_currency_average_rate = $this->calculatesBookingCurrencyAverageRate->execute($booking, TransactionType::BILL);
 
+        $transaction = $booking->transactions()
+            ->where('type', TransactionType::BILL)
+            ->first();
+
         $transaction_object = new TransactionObject(
             $billNumber,
             TransactionType::SUPPLIER_DELIVER,
diff --git a/routes/web.php b/routes/web.php
index 089d7f36..9e5395b0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -2,6 +2,7 @@
 
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Models\Booking;
+use App\Models\Transaction;
 use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -87,10 +88,17 @@ Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsP
     return $exportsProducts->download('products.csv', Excel::CSV, ['Content-Type' => 'text/csv']);
 })->name('products.random');
 
+Route::get('/fix_bills', function () {
+    Auth()->login(User::find(1));
+    $supplierDo = Transaction::where('type', TransactionType::SUPPLIER_DELIVER)->where('issuer', 1)->withTrashed()->get();
+    foreach ($supplierDo as $do){
+        $bill = $do->owner->transactions()
+            ->where('type', TransactionType::BILL)
+            ->first();
+        $do->issuer = $bill->issuer;
+        $do->receiver = $bill->receiver;
+        $do->save();
+    }
 
-//Route::get('/duplicated_bills', function (Request $request) {
-//    Auth()->login(User::find(1));
-//    $bookings = Booking::whereIn('id', [10391, 10275, 10109, 10108, 10070, 10066, 10063, 9801, 9166, 8895, 8790, 8544, 8264, 6957, 5409, 4717])->with('transactions')->pluck('marking');
-//    dd($bookings);
-//
-//})->name('x2.data');
\ No newline at end of file
+
+})->name('products.random');
\ No newline at end of file

From 2558defa5f42430d7738f921084200f4340870be Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sun, 13 Feb 2022 15:07:40 +0800
Subject: [PATCH 5/6] fix Supplier delivery order

---
 .../views/pages/pdfs/supplier_deliver_order.blade.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/resources/views/pages/pdfs/supplier_deliver_order.blade.php b/resources/views/pages/pdfs/supplier_deliver_order.blade.php
index f1e0d6c6..fbd2ad8a 100644
--- a/resources/views/pages/pdfs/supplier_deliver_order.blade.php
+++ b/resources/views/pages/pdfs/supplier_deliver_order.blade.php
@@ -5,9 +5,14 @@
         <br>
         <table width="100%" style="border-bottom: 1px solid black;">
             <tr>
-                <td
-                    style="text-align: center; color: red; text-transform: uppercase; font-weight: bold; font-size: 18px;  padding-bottom: 5px;">
-                    Atvantic Import & Export Snd. Bhd (1309816-P)</td>
+                <td style="text-align: center; color: red; text-transform: uppercase; font-weight: bold; font-size: 18px;  padding-bottom: 5px;">
+                    @if(in_array($supplier_deliver_order_transaction->issuer, [2, 1921]))
+                        Atvantic Import & Export Snd. Bhd (1309816-P)
+                    @endif
+                    @if(in_array($supplier_deliver_order_transaction->issuer, [1937, 1970]))
+                        BK Gemilang Sdn Bhd (1403513-U)
+                    @endif
+                </td>
             </tr>
         </table>
     </htmlpageheader>

From a6038a47ba56102a7d31d3a2301e6061d730d6f8 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Sun, 13 Feb 2022 15:36:16 +0800
Subject: [PATCH 6/6] fix Supplier delivery order

---
 routes/web.php | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 9e5395b0..4e63cede 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,14 +1,16 @@
 <?php
 
+use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Classes\ValueObjects\Constants\TransactionType;
-use App\Models\Booking;
 use App\Models\Transaction;
 use App\Models\User;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Route;
 use Maatwebsite\Excel\Excel;
+use Meneses\LaravelMpdf\Facades\LaravelMpdf;
 
 /*
 |--------------------------------------------------------------------------
@@ -89,16 +91,25 @@ Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsP
 })->name('products.random');
 
 Route::get('/fix_bills', function () {
+    ini_set('max_execution_time', '10000');
     Auth()->login(User::find(1));
-    $supplierDo = Transaction::where('type', TransactionType::SUPPLIER_DELIVER)->where('issuer', 1)->withTrashed()->get();
-    foreach ($supplierDo as $do){
-        $bill = $do->owner->transactions()
-            ->where('type', TransactionType::BILL)
-            ->first();
-        $do->issuer = $bill->issuer;
-        $do->receiver = $bill->receiver;
-        $do->save();
-    }
+    Transaction::where('type', TransactionType::SUPPLIER_DELIVER)->whereIn('issuer', [1937, 1970])->chunk(50, function($dos){
+        foreach ($dos as $do){
+            $do->booking->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->delete();
+            $supplier = [];
+            $po = $do->booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first();
+            $supplier_order_pdf = LaravelMpdf::loadView('pages.pdfs.supplier_deliver_order', ['supplier_deliver_order_transaction' => $do, 'po_order_transaction' => $po, 'supplier' => $supplier]);
+            $document_object = new DocumentObject(
+                DocumentType::SUPPLIER_DELIVER_ORDER,
+                [chunk_split('data:application/pdf;base64,'.base64_encode($supplier_order_pdf->output()))],
+                '',
+                ApprovalStatus::COMPLETED,
+                'supplier_delivery_orders'
+            );
+            $document = (App()->make(CreatesDocument::class))->execute($do->booking, $document_object);
+            (App()->make(CreatesFiles::class))->execute($document, $document_object);
+        }
+    });
 
 
 })->name('products.random');
\ No newline at end of file