change select box for item attribute in menu item instance and button UI for CRM/Queue

This commit is contained in:
phyusin
2017-11-27 13:33:20 +06:30
parent 98be8b37a4
commit 9ad9e9ae57
5 changed files with 6 additions and 20 deletions

View File

@@ -48,30 +48,16 @@ class Origami::ShiftsController < BaseOrigamiController
unique_code = "CloseCashierPdf"
shop_details = Shop.find(1)
puts "shop details"
p shop_details
#get tax
shift_obj = ShiftSale.where('id =?',@shift.id)
puts "shift obj"
p shift_obj
@sale_taxes = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='')
puts "sale taxes"
p @sale_taxes
#other payment details for mpu or visa like card
@other_payment = ShiftSale.get_by_shift_other_payment(@shift)
puts "other payment"
p @other_payment
# Calculate price_by_accounts
@total_amount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'amount')
puts "total amount by account"
p @total_amount_by_account
@total_discount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'discount')
puts "total_discount_by_account"
p @total_discount_by_account
@total_member_discount = ShiftSale.get_total_member_discount(@shift)
puts "total_member_discount"
p @total_member_discount
# get printer info
print_settings = PrintSetting.find_by_unique_code(unique_code)

View File

@@ -105,9 +105,9 @@ class Settings::MenuItemInstancesController < ApplicationController
end
respond_to do |format|
if @settings_menu_item_instances.update(settings_menu_item_instance_params)
@settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].reject(&:blank?)
#@settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].reject(&:blank?)
@settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].split(" ")
@settings_menu_item_instances.save
format.html { redirect_to settings_menu_category_simple_menu_item_path(category,catID), notice: 'Menu item instance was successfully updated.' }
format.json { render :show, status: :ok, location: @settings_menu_item_instances }