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

credit payment fix when visa assign

Browse Source
This commit is contained in:
Yan
2017-11-27 14:24:34 +06:30
parent 9ad9e9ae57
commit 0c084a1816
3 changed files with 4 additions and 4 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 @creditcount = 0
others = 0 others = 0
sale_data.sale_payments.each do |sale_payment| 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 @creditcount = @creditcount + sale_payment.payment_amount
else else
others = others + sale_payment.payment_amount others = others + sale_payment.payment_amount

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

@@ -67,7 +67,7 @@ class Settings::MenuItemInstancesController < ApplicationController
respond_to do |format| respond_to do |format|
if @settings_menu_item_instances.save if @settings_menu_item_instances.save
@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 @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.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 } format.json { render :show, status: :created, location: @settings_menu_item_instances }

4
app/views/origami/credit_payments/index.html.erb
View File

@@ -40,13 +40,13 @@
<!-- </div> --> <!-- </div> -->
<% end %> <% end %>
<!-- <div class="row"> --> <!-- <div class="row"> -->
<div class="row"> <!-- <div class="row">
<div class="col-lg-5 col-md-5 col-sm-5"> <div class="col-lg-5 col-md-5 col-sm-5">
<label >Recent Credit Amount</label> <label >Recent Credit Amount</label>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6"> <div class="col-lg-6 col-md-6 col-sm-6">
<input type="text" name="valid_amount" id="valid_amount" class="form-control" value="" data-value="<%=@sale_id %>" data-member-value=""> <input type="text" name="valid_amount" id="valid_amount" class="form-control" value="" data-value="<%=@sale_id %>" data-member-value="">
</div> </div> -->
</div> </div>
<hr> <hr>
<!-- </div> --> <!-- </div> -->