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/bill_controller.rb
+++ b/app/controllers/api/bill_controller.rb
@@ -106,7 +106,7 @@ class Api::BillController < Api::ApiController

    # unique_code = "ReceiptBillPdf"
    # #shop detail
-    # shop_details = Shop.find(1)
+    # shop_details = Shop.current_shop

    # customer= Customer.find(@sale_data.customer_id)
    # # get member information