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

check print copy greater than 0 in print_settings

Browse Source
This commit is contained in:
phyusin
2017-11-27 19:33:18 +06:30
parent ad34002789 7a28dc1ddc
commit 4192a94d47
7 changed files with 67 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/origami/credit_payments_controller.rb
View File

@@ -8,7 +8,7 @@ class Origami::CreditPaymentsController < BaseOrigamiController
@creditcount = 0
others = 0
sale_data.sale_payments.each do |sale_payment|
if sale_payment.payment_method == "visa"
if sale_payment.payment_method == "creditnote"
@creditcount = @creditcount + sale_payment.payment_amount
else
others = others + sale_payment.payment_amount

4
app/controllers/settings/menu_item_instances_controller.rb
View File

@@ -67,7 +67,11 @@ class Settings::MenuItemInstancesController < ApplicationController
respond_to do |format|
if @settings_menu_item_instances.save
<<<<<<< HEAD
@settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].split("")
=======
@settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].split(" ")
>>>>>>> 7a28dc1ddc100e61789fae7f1f3503e2f703711e
@settings_menu_item_instances.save
format.html { redirect_to settings_menu_category_simple_menu_item_path(category,catID), notice: 'Menu item instance was successfully created.' }
format.json { render :show, status: :created, location: @settings_menu_item_instances }