fixed conflict after merch dev for current shop

2019-12-02 19:30:24 +06:30
parent 6ad2f320df 937f40e7c1
commit 417d64ecae
92 changed files with 1611 additions and 350 deletions
--- a/app/controllers/api/payment/mobilepayment_controller.rb
+++ b/app/controllers/api/payment/mobilepayment_controller.rb
@@ -14,7 +14,8 @@ class Api::Payment::MobilepaymentController < Api::ApiController

      saleObj = Sale.find(sale_id)
      sale_items = SaleItem.get_all_sale_items(sale_id)
-      # shop_detail =  Shop.first
+
+      shop_detail =  Shop.current_shop

      # rounding adjustment
      if !path.include? ("credit_payment")