From 0f328056100acf2dc2da937bb0b5f5ad07f86c3a Mon Sep 17 00:00:00 2001
From: Omair Saleh <uldvstar@gmail.com>
Date: Fri, 3 May 2019 11:11:02 +0800
Subject: [PATCH] multiple po and invoice fix

---
 app/Http/Controllers/BookingController.php    | 14 ++++++++----
 .../js/pages/admin/booking/completed.vue      | 22 ++++++++++++-------
 .../assets/js/pages/booking/completed.vue     | 16 --------------
 3 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index d0ce0be5..375d7c81 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -320,8 +320,8 @@ class BookingController extends Controller
             $china_bankslip = null;
         }
 
-        $po = $booking->purchaseOrder()->first();
-        $invoice = $booking->invoice()->first();
+        $po = $booking->purchaseOrder()->get();
+        $invoice = $booking->invoice()->get();
 
 		if($booking){
             if ($user_bankslip){
@@ -338,11 +338,17 @@ class BookingController extends Controller
             }
 
             if($po){
-                $booking->user_po_path = Storage::url($po->image_path);
+                for($index = 0;$index < count($po); $index++){
+                    $po[$index] = Storage::url($po[$index]->image_path);
+                }
+                $booking->user_po_path = $po;
             }
 
             if($invoice){
-                $booking->invoice_path = Storage::url($invoice->invoice_path);
+                for($index = 0;$index < count($invoice); $index++){
+                    $invoice[$index] = Storage::url($invoice[$index]->invoice_path);
+                }
+                $booking->invoice_path = $invoice;
             }
 
             $booking->service_charge = 0;
diff --git a/resources/assets/js/pages/admin/booking/completed.vue b/resources/assets/js/pages/admin/booking/completed.vue
index bd18687e..f39495c7 100644
--- a/resources/assets/js/pages/admin/booking/completed.vue
+++ b/resources/assets/js/pages/admin/booking/completed.vue
@@ -21,10 +21,13 @@
           </div>
           <el-row :gutter="12" type="flex">
             <el-col :span="12" align="center">
-              <a target="_blank" :href="getURL(booking_details.user_po_path)">
-                <img v-if="isImage(booking_details.user_po_path)" v-bind:src="booking_details.user_po_path" class="image">
-                <p v-else>Download</p>
-              </a>
+              <div v-for="po in booking_details.user_po_path" :key='po'>
+                <a target="_blank" :href="getURL(po)">
+                  <img v-if="isImage(po)" v-bind:src="po" class="image">
+                  <p v-else>Download</p>
+                  <br/>
+                </a>
+              </div>
             </el-col>
           </el-row>
 
@@ -57,10 +60,13 @@
           </div>
           <el-row :gutter="12" type="flex">
             <el-col :span="12" align="center">
-              <a target="_blank" :href="getURL(booking_details.invoice_path)">
-                <img v-if="isImage(booking_details.invoice_path)" v-bind:src="booking_details.invoice_path" class="image">
-                <p v-else>Download</p>
-              </a>
+              <div v-for="invoice in booking_details.invoice_path" :key='invoice'>
+                <a target="_blank" :href="getURL(invoice)">
+                  <img v-if="isImage(invoice)" v-bind:src="invoice" class="image">
+                  <p v-else>Download</p>
+                  <br/>
+                </a>
+              </div>
             </el-col>
           </el-row>
         </el-card>
diff --git a/resources/assets/js/pages/booking/completed.vue b/resources/assets/js/pages/booking/completed.vue
index f4fefd91..6959b4f1 100644
--- a/resources/assets/js/pages/booking/completed.vue
+++ b/resources/assets/js/pages/booking/completed.vue
@@ -20,14 +20,6 @@
               </a>
             </div>
           </div>
-          <!--<div class="row">-->
-            <!--<div class="card-body">-->
-              <!--<a target="_blank" :href="getURL(booking_details.user_po_path)">-->
-                <!--<img v-if="isImage(booking_details.user_po_path)" v-bind:src="booking_details.user_po_path" class="image">-->
-                <!--<p v-else>Download</p>-->
-              <!--</a>-->
-            <!--</div>-->
-          <!--</div>-->
         </div>
       </div>
       <div class="col">
@@ -56,14 +48,6 @@
               </a>
             </div>
           </div>
-          <!--<div class="row">-->
-            <!--<div class="card-body">     -->
-              <!--<a target="_blank" :href="getURL(booking_details.invoice_path)">-->
-                <!--<img v-if="isImage(booking_details.invoice_path)" v-bind:src="booking_details.invoice_path" class="image">-->
-                <!--<p v-else>Download</p>-->
-              <!--</a>-->
-            <!--</div>-->
-          <!--</div>-->
         </div>
       </div>
     </div>