shop code

2019-12-10 15:18:48 +06:30
parent c606ca73db
commit 79598c0126
115 changed files with 247 additions and 396 deletions
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -1,7 +1,6 @@
 class Origami::VoidController < BaseOrigamiController
   authorize_resource :class => false
  def overall_void
-    @shop = Shop.current_shop
    sale_id = params[:sale_id]
    remark  = params[:remark]
    order_source = params[:type] #tax profile source
@@ -114,9 +113,6 @@ class Origami::VoidController < BaseOrigamiController
      # end

        customer= Customer.find(sale.customer_id)
-
-         #shop detail
-        shop_details = Shop.current_shop
         # get member information
        rebate = MembershipSetting.find_by_rebate_and_shop_code(1,@shop.shop_code)
        if customer.membership_id != nil && rebate