From 4b950fc37372e04d31c5ec22bcfa67c8271adeca Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 18 May 2021 13:59:31 +0800
Subject: [PATCH] fixing bugs

---
 .../components/bookings/forms/PurchaseOrderFormComponent.vue  | 2 +-
 routes/booking.php                                            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
index 5e9cc914..2a52724a 100644
--- a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
@@ -112,7 +112,7 @@
                                     </div>
                                 </div>
                                 <!--link to merge: route('booking.merge',this.data.marking) -->
-                                <a class="btn btn-xs all-caps b-rad-none btn-warning" href="#">Merge Transfer Orders</a>
+                                <a class="btn btn-xs all-caps b-rad-none btn-warning" :href="process.env.APP_ENV !== 'production' ? route('booking.merge',this.data.marking) : '#'">Merge Transfer Orders</a>
                             </div>
                         </div>
                     </div>
diff --git a/routes/booking.php b/routes/booking.php
index 6b54ff92..03f9bb3f 100644
--- a/routes/booking.php
+++ b/routes/booking.php
@@ -17,7 +17,7 @@ Route::group(['prefix' => 'booking', 'as' => 'booking.', 'namespace' => 'Booking
     });
 
     Route::post('{id}/purchase_order/verification', 'ApprovePurchaseOrderController@approve')->name('po.approval');
-    //Temporarily disabled
-    //Route::post('/merge', 'MergeBookingController@merge')->name('merge');
+
+    Route::post('/merge', 'MergeBookingController@merge')->name('merge');
 
 });
\ No newline at end of file