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

void

Browse Source
This commit is contained in:
Myat Zin Wai Maw
2019-12-09 17:27:38 +06:30
parent b0f6368248
commit 5b3a62917d
16 changed files with 509 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/origami/request_bills_controller.rb
View File

@@ -9,7 +9,7 @@ class Origami::RequestBillsController < ApplicationController
# Print Request Bill and add to sale tables
def print
@shop = Shop.current_shop
if !ShiftSale.current_shift(@shop.shop_code).nil?
if !ShiftSale.current_shift.nil?
order_id = params[:id] # order_id
order = Order.find(order_id)
booking = order.booking
@@ -46,7 +46,7 @@ class Origami::RequestBillsController < ApplicationController
sale_audit = SaleAudit.record_audit_sale(sale_data.sale_id,remark,action_by,type )
# Promotion Activation
Promotion.promo_activate(sale_data,@shop.shop_code)
Promotion.promo_activate(sale_data)
#bill channel
if ENV["SERVER_MODE"] == 'cloud'