git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflict after merch dev for current shop

Browse Source
This commit is contained in:
Nweni
2019-12-02 19:30:24 +06:30
parent 6ad2f320df 937f40e7c1
commit 417d64ecae
92 changed files with 1611 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/origami/alipay_controller.rb
View File

@@ -11,7 +11,8 @@ class Origami::AlipayController < BaseOrigamiController
end
total = 0
@alipaycount = 0
# @shop = Shop.first
@shop = Shop.current_shop
@rounding_adj = 0
@can_alipay = 0
@member_discount = 0
@@ -64,7 +65,8 @@ class Origami::AlipayController < BaseOrigamiController
ref_no = params[:ref_no]
if(Sale.exists?(sale_id))
saleObj = Sale.find(sale_id)
# shop_details = Shop.first
shop_details = Shop.current_shop
# rounding adjustment
# if shop_details.is_rounding_adj
@@ -86,8 +88,9 @@ class Origami::AlipayController < BaseOrigamiController
end
#Shop Name in Navbor
# helper_method :shop_detail
# def shop_detail
# @shop = Shop.first
# end
helper_method :shop_detail
def shop_detail
@shop = Shop.current_shop
end
end