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/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -46,6 +46,7 @@ class Api::OrdersController <  Api::ApiController
      @tax_profile = TaxProfile.where("lower(group_type)='cashier'")
    # end

+    @shop = Shop.current_shop
    return @shop.to_json
  end