diff --git a/Gemfile b/Gemfile index d445ec42..01a87af7 100644 --- a/Gemfile +++ b/Gemfile @@ -91,4 +91,4 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem 'httparty', '~> 0.15.5' -gem 'bootstrap-datepicker-rails' \ No newline at end of file +gem 'bootstrap-datepicker-rails' diff --git a/app/assets/javascripts/orgiami.js b/app/assets/javascripts/origami.js similarity index 83% rename from app/assets/javascripts/orgiami.js rename to app/assets/javascripts/origami.js index 20ac5b26..8ce3d0c4 100644 --- a/app/assets/javascripts/orgiami.js +++ b/app/assets/javascripts/origami.js @@ -143,7 +143,7 @@ $(document).ready(function(){ }); // Payment for Bill - $('#pay').click(function() { + $('#pay-bill').click(function() { var sale_id=$(".selected-item").find(".orders-id").text(); if(sale_id!=""){ window.location.href = '/origami/sale/'+ sale_id + "/payment" @@ -160,52 +160,53 @@ $(document).ready(function(){ window.location.href = '/crm/customers/'+ sale_id + "/assign_sale_id" return false; }); -}); -/* For Receipt - Calculate discount or tax */ -$(document).on('click', '.cashier_number', function(event){ - if(event.handled !== true) { - var original_value=0; - original_value = $('#discount-amount').val(); + /* For Receipt - Calculate discount or tax */ + $('.cashier_number').on('click', function(event){ + if(event.handled !== true) { + var original_value=0; + original_value = $('#discount-amount').val(); - var input_type = $(this).attr("data-type"); - - switch (input_type) { - case 'num': - var input_value = $(this).attr("data-value"); - if (original_value == "0.0"){ - $('#discount-amount').val(input_value); + var input_type = $(this).attr("data-type"); + + switch (input_type) { + case 'num': + var input_value = $(this).attr("data-value"); + if (original_value == "0.0"){ + $('#discount-amount').val(input_value); + update_balance(); + } + else{ + $('#discount-amount').val(original_value + '' + input_value); + update_balance(); + } + break; + + case 'add': + var input_value = $(this).attr("data-value"); + amount = parseInt(input_value) + parseInt(original_value); + $('#discount-amount').val(amount); update_balance(); - } - else{ - $('#discount-amount').val(original_value + '' + input_value); + break; + + case 'del' : + var discount_text=$('#discount-amount').val(); + $('#discount-amount').val(discount_text.substr(0,discount_text.length-1)); update_balance(); - } - break; + break; - case 'add': - var input_value = $(this).attr("data-value"); - amount = parseInt(input_value) + parseInt(original_value); - $('#discount-amount').val(amount); - update_balance(); - break; + case 'clr': + $('#discount-amount').val("0.0"); + update_balance(); + break; + } - case 'del' : - var discount_text=$('#discount-amount').val(); - $('#discount-amount').val(discount_text.substr(0,discount_text.length-1)); - update_balance(); - break; + event.handled = true; + } else { + return false; + } + }); - case 'clr': - $('#discount-amount').val("0.0"); - update_balance(); - break; - } - - event.handled = true; - } else { - return false; - } }); /* Button Control by Status */ diff --git a/app/assets/javascripts/origami/payment.js b/app/assets/javascripts/origami/payment.js deleted file mode 100644 index e21a369e..00000000 --- a/app/assets/javascripts/origami/payment.js +++ /dev/null @@ -1,113 +0,0 @@ -// $(document).on('touchstart click', '.keypad', function(event){ -// event.stopPropagation(); -// event.preventDefault(); -// if(event.handled !== true) { -// -// // Do your magic here. -// var input_value = $(this).attr("data-value"); -// switch (input_value) { -// -// case 'delete': -// process_delete_payment(); -// break; -// -// case 'foc': -// remove_input_action(); -// $(".foc").attr("data-action","true"); -// if(customerName.toString() != " "){ //if already chosen customer -// if($("#foc_reason_lists").attr("foc_reason") == ' '){ -// alert("Please! Choose or Add FOC reason"); -// foc_additional_form(); -// } -// else{ -// process_foc_payment(); -// } -// } -// else{ -// alert("Please! Choose or Save Customer"); -// foc_additional_form(); -// } -// break; -// -// case 'nett': -// remove_input_action(); -// $(".nett").attr("data-action","true"); -// if($(".credit_note_payment").hasClass("payment_selected")){ -// if(customerName == " "){ -// alert("Please! Choose or Save Customer"); -// showCustomer(); -// } -// else{ -// $("#accept_payment_btn").attr("data-payment","credit"); -// process_nett_payment(); -// } -// } -// else{ -// process_nett_payment(); -// } -// break; -// -// case 'edit': -// process_edit_invoice(); -// break; -// -// case 'cancel': -// remove_input_action(); -// var status = $("#label_amountdue").attr("data-status"); -// if (status != 'completed' && status != 'void'){ -// $(".cancel").attr("data-action","true"); -// var message = confirm("Are you sure to void? Please, add reason!"); -// if (message == true) { -// $(".additional_form").hide(); -// $("#void_sale_additional_form").show(); -// process_cancel_payment(); -// } -// } -// else{ -// $(".cancel").addClass("dim"); -// } -// break; -// -// case 'ent': -// amount_due = parseFloat($("#label_amountdue").attr("data-original")); -// other_amt = parseFloat($("#label_cash_amount").attr("data-value")); -// credit_amount = parseFloat($("#label_credit_note").text()); -// if ($(".credit_note_payment").hasClass("payment_selected") && credit_amount > 0){ -// if(customerName.toString() != " "){ -// if(credit_amount > (amount_due - other_amt)){ -// alert("You shouldn't exceed the amount due."); -// } -// else{ -// $("#accept_payment_btn").attr("data-payment","credit"); -// update_balance_due(); -// } -// } -// else{ -// alert("Please! Choose or Save Customer"); -// } -// } -// else{ -// update_balance_due(); -// } -// -// break; -// case 'clear': -// process_clear_payment(); -// break; -// -// default: -// -// var existing_value = $(".payment_selected span").text(); -// -// if (existing_value == "0" || existing_value == "0.00") { existing_value = ""; } -// existing_value = existing_value + input_value; -// $(".payment_selected span").text(existing_value); -// -// } -// -// -// event.handled = true; -// } else { -// return false; -// } -// }); diff --git a/app/assets/javascripts/origami/paypar.coffee b/app/assets/javascripts/origami/paypar.coffee deleted file mode 100644 index 24f83d18..00000000 --- a/app/assets/javascripts/origami/paypar.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/origami/request_bills.coffee b/app/assets/javascripts/origami/request_bills.coffee deleted file mode 100644 index 24f83d18..00000000 --- a/app/assets/javascripts/origami/request_bills.coffee +++ /dev/null @@ -1,3 +0,0 @@ -# Place all the behaviors and hooks related to the matching controller here. -# All this logic will automatically be available in application.js. -# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/orgiami.scss b/app/assets/stylesheets/origami.scss similarity index 100% rename from app/assets/stylesheets/orgiami.scss rename to app/assets/stylesheets/origami.scss diff --git a/app/assets/stylesheets/origami/paypar.scss b/app/assets/stylesheets/origami/paypar.scss deleted file mode 100644 index 8cc055f3..00000000 --- a/app/assets/stylesheets/origami/paypar.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the origami/paypar controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/origami/request_bills.scss b/app/assets/stylesheets/origami/request_bills.scss deleted file mode 100644 index 20719090..00000000 --- a/app/assets/stylesheets/origami/request_bills.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the origami/RequestBills controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index a98c8f3d..193a4a45 100644 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -9,11 +9,11 @@ class Api::BillController < Api::ApiController #create Bill by Booking ID if (params[:booking_id]) @sale = Sale.new - @status = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name) - + @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name) + elsif (params[:order_id]) @sale = Sale.new - @status = @sale.generate_invoice_from_order(params[:order_id], current_login_employee.name) + @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee.name) end end diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 325ac7dd..e1283bd6 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -38,10 +38,10 @@ class Crm::CustomersController < ApplicationController def create @crm_customers = Customer.new(customer_params) - + respond_to do |format| if @crm_customers.save - + name = customer_params[:name] phone = customer_params[:contact_no] @@ -63,12 +63,10 @@ class Crm::CustomersController < ApplicationController ) if response["status"] == true - puts "hhhhhhhhhhhhhhhhhh" - puts params[:sale_id] customer = Customer.find(@crm_customers.customer_id) status = customer.update_attributes(membership_id: response["customer_datas"]["id"]) - if params[:sale_id] != 0 - format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' } + if params[:sale_id] != 0 + format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' } else format.html { redirect_to '/crm/customers/'+params[:sale_id]+'/assign_sale_id', notice: 'Customer was successfully created.' } end @@ -77,27 +75,27 @@ class Crm::CustomersController < ApplicationController @crm_customers.destroy - if params[:sale_id] != 0 + if params[:sale_id] != 0 format.html { redirect_to crm_customers_path, notice: response["message"] } - + else format.html { redirect_to '/crm/customers/'+params[:sale_id]+'/assign_sale_id', notice: response["message"] } end - + end - + # format.json { render :index, status: :created, location: @crm_customers } else if params[:sale_id] != 0 format.html { redirect_to crm_customers_path} format.json { render json: @crm_customers.errors, status: :unprocessable_entity } - + else format.html { redirect_to '/crm/customers/'+params[:sale_id]+'/assign_sale_id', notice: response["message"] } end - + end end end @@ -105,7 +103,7 @@ class Crm::CustomersController < ApplicationController # PATCH/PUT /crm/customers/1 # PATCH/PUT /crm/customers/1.json def update - + respond_to do |format| if @crm_customer.update(customer_params) @@ -118,7 +116,7 @@ class Crm::CustomersController < ApplicationController membership = MembershipSetting.find_by_membership_type("paypar_url") app_token = membership.auth_token.to_s url = membership.gateway_url.to_s + "/api/update_membership_customer".to_s - + response = HTTParty.post(url, :body => { name: name,phone: phone,email: email, date_of_birth: date_of_birth, id: id}.to_json, @@ -127,7 +125,7 @@ class Crm::CustomersController < ApplicationController 'Accept' => 'application/json' } ) - + format.html { redirect_to crm_customers_path, notice: 'Customer was successfully updated.' } format.json { render :show, status: :ok, location: @crm_customer } @@ -153,7 +151,7 @@ class Crm::CustomersController < ApplicationController # DELETE /crm/customers/1 # DELETE /crm/customers/1.json def get_sale_id - + @sale_id = params[:sale_id] @crm_customers = Customer.all @crm_customer = Customer.new @@ -179,5 +177,3 @@ class Crm::CustomersController < ApplicationController params.require(:customer).permit(:name, :company, :contact_no, :email, :date_of_birth, :membership_type, :membership_authentication_code) end end - - diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index bac414ad..a3831439 100644 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -10,7 +10,7 @@ class Origami::PaymentsController < BaseOrigamiController if(Sale.exists?(sale_id)) saleObj = Sale.find(sale_id) sale_payment = SalePayment.new - sale_payment.process_payment(saleObj, @user, cash) + sale_payment.process_payment(saleObj, @user, cash, "cash") end end @@ -18,6 +18,11 @@ class Origami::PaymentsController < BaseOrigamiController sale_id = params[:sale_id] if Sale.exists?(sale_id) @sale_data = Sale.find_by_sale_id(sale_id) + @sale_data.sale_payments.each do |spay| + if spay.payment_method == "cash" + @cash = spay.payment_amount + end + end end end diff --git a/app/controllers/origami/paypar_payments_controller.rb b/app/controllers/origami/paypar_payments_controller.rb index 67850117..0c3ea11f 100644 --- a/app/controllers/origami/paypar_payments_controller.rb +++ b/app/controllers/origami/paypar_payments_controller.rb @@ -18,4 +18,4 @@ class Origami::PayparPaymentsController < BaseOrigamiController end end -end \ No newline at end of file +end diff --git a/app/controllers/settings/membership_actions_controller.rb b/app/controllers/settings/membership_actions_controller.rb index 86292258..50aad862 100644 --- a/app/controllers/settings/membership_actions_controller.rb +++ b/app/controllers/settings/membership_actions_controller.rb @@ -14,13 +14,15 @@ class Settings::MembershipActionsController < ApplicationController if !membership_actions_data.nil? url = params[:gateway_url].to_s + membership_actions_data.gateway_url.to_s puts url.to_json - sale_data = Sale.find_by_sale_id(@sale_id) + sale_data = Sale.find_by_sale_id(@sale_id) if sale_data.customer_id customer_data= Customer.find_by_customer_id(sale_data.customer_id) + puts customer_data.to_json @membership_id = customer_data.membership_id @campaign_type_id =1 if !@membership_id.nil? membership_setting = MembershipSetting.find_by_membership_type("paypar_url") + puts membership_setting membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id) if membership_data["status"]==true @membership_rebate_balance=membership_data["balance"] @@ -41,7 +43,7 @@ class Settings::MembershipActionsController < ApplicationController end render :json => @out.to_json end - + end # GET /settings/membership_actions/1 diff --git a/app/models/sale.rb b/app/models/sale.rb index b0f07cb0..47d271f1 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -3,7 +3,6 @@ class Sale < ApplicationRecord #primary key - need to be unique generated for multiple shops before_create :generate_custom_id - #before_create :generate_receipt_no belongs_to :cashier, :optional => true belongs_to :customer, :optional => true @@ -17,7 +16,6 @@ class Sale < ApplicationRecord scope :open_invoices, -> { where("sale_status = 'new' and receipt_date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") } def generate_invoice_from_booking(booking_id, requested_by) - puts "get invoice from booking" booking = Booking.find(booking_id) status = false Rails.logger.debug "Booking -> " + booking.id.to_s @@ -33,7 +31,6 @@ class Sale < ApplicationRecord booking.sale_id = sale_id end order = booking.booking_orders.take.order - puts "add sale order" link_order_sale(order.id) return status, sale_id end @@ -231,9 +228,10 @@ class Sale < ApplicationRecord def link_order_sale(order_id) #create if it doesn't exist saleOrder = SaleOrder.where("sale_id=? and order_id=?", self.id, order_id).take - + if saleOrder.nil? - SaleOrder.create(:sale_id => self.id, :order_id => order_id) + sale_order = SaleOrder.new + sale_order.create_sale_order(self.id, order_id) end # if (SaleOrder.where("sale_id = #{self.id} and order_id=#{order_id}").nil?) # SaleOrder.create(:sale_id => self.id, :order_id => order_id) @@ -261,6 +259,7 @@ class Sale < ApplicationRecord end private + def generate_custom_id self.sale_id = SeedGenerator.generate_id(self.class.name, "SAL") end diff --git a/app/models/sale_order.rb b/app/models/sale_order.rb index 15da1386..786054c9 100644 --- a/app/models/sale_order.rb +++ b/app/models/sale_order.rb @@ -2,13 +2,22 @@ class SaleOrder < ApplicationRecord self.primary_key = "sale_order_id" #primary key - need to be unique generated for multiple shops - before_create :generate_custom_id + before_create :generate_sale_order_id belongs_to :sale belongs_to :order + def create_sale_order(sale, order) + self.sale_id = sale + self.order_id = order + self.save + + end + private - def generate_custom_id - self.sale_order_id = SeedGenerator.generate_id(self.class.name, "SOI") + def generate_sale_order_id + self.class.name + saleOrderId = SeedGenerator.generate_id(self.class.name, "SOI") + self.sale_order_id = saleOrderId end end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 57188d5c..aee7ace4 100644 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -8,7 +8,7 @@ class SalePayment < ApplicationRecord attr_accessor :received_amount, :card_payment_reference, :voucher_no, :giftcard_no, :customer_id, :external_payment_status - def process_payment(invoice, action_by, cash_amount,payment_method) + def process_payment(invoice, action_by, cash_amount, payment_method) self.sale = invoice self.received_amount = cash_amount @@ -75,7 +75,7 @@ class SalePayment < ApplicationRecord } ) return response; - + end def self.redeem(paypar_url,token,membership_id,received_amount,sale_id,campaign_type_id) @@ -93,9 +93,9 @@ class SalePayment < ApplicationRecord else response =false; end - + return response; - + end private @@ -103,7 +103,7 @@ class SalePayment < ApplicationRecord payment_status = false self.payment_method = "cash" self.payment_amount = self.received_amount - self.outstanding_amount = self.sale.grand_total - self.received_amount + self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f self.payment_status = "paid" payment_method = self.save! @@ -195,21 +195,33 @@ class SalePayment < ApplicationRecord if membership_data["status"]==true SalePayment.where(:sale_payment_id => self.sale_payment_id).update_all(:payment_status => 'paid') sale_update_payment_status(self.received_amount.to_f) - + else sale_update_payment_status(0) end - return payment_status end def sale_update_payment_status(paid_amount) + puts "sale update" #update amount_outstanding - self.sale.amount_received = self.sale.amount_received + paid_amount - self.sale.amount_changed = paid_amount - self.sale.amount_received - if (self.sale.grand_total <= self.sale.amount_received && self.sale.amount_changed > 0) + self.sale.amount_received = self.sale.amount_received.to_f + paid_amount.to_f + + self.sale.amount_changed = paid_amount.to_f - self.sale.amount_received.to_f + + all_received_amount = 0.0 + sObj = self.sale + sObj.sale_payments.each do |spay| + puts spay + puts spay.payment_amount + all_received_amount += spay.payment_amount.to_f + end + puts all_received_amount + puts self.sale.grand_total + if (self.sale.grand_total <= all_received_amount) + puts " sale update ......" self.sale.payment_status = "paid" self.sale.sale_status = "completed" self.sale.save! diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb index 5e7864b6..fe896a4d 100644 --- a/app/models/seed_generator.rb +++ b/app/models/seed_generator.rb @@ -1,7 +1,9 @@ class SeedGenerator < ApplicationRecord + def self.generate_id(model, prefix) seed = SeedGenerator.find_by_model(model) new_receipt_no = 0 + if (seed.nil?) seed = SeedGenerator.new() seed.model = model @@ -16,8 +18,8 @@ class SeedGenerator < ApplicationRecord end padding_len = 15 - prefix.length - - return prefix +"-"+ seed.current.to_s.to_s.rjust((14-prefix.length)+1,'0') + saleOrderId = prefix +"-"+ seed.current.to_s.to_s.rjust((14-prefix.length)+1,'0') + return saleOrderId end diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 47c10ac9..bdd146b7 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -20,6 +20,7 @@
  • <%= link_to "Membership Setting",settings_membership_settings_path, :tabindex =>"-1" %>
  • <%= link_to "Payment Method", settings_payment_method_settings_path, :tabindex =>"-1" %>
  • <%= link_to "Tax Profile", settings_tax_profiles_path, :tabindex =>"-1" %>
    • +
  • <%= link_to "Print Setting", print_settings_path, :tabindex =>"-1" %>
    • @@ -30,9 +31,14 @@
  • <%= link_to "Sales ", crm_root_path, :tabindex =>"-1" %>
    • - +
  • + + +
    • diff --git a/app/views/layouts/origami.html.erb b/app/views/layouts/origami.html.erb index 2c438597..ef5f3789 100644 --- a/app/views/layouts/origami.html.erb +++ b/app/views/layouts/origami.html.erb @@ -9,8 +9,8 @@ SmartSales : Restaurant <%= csrf_meta_tags %> - <%= stylesheet_link_tag 'orgiami', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_include_tag 'orgiami', 'data-turbolinks-track': 'reload' %> + <%= stylesheet_link_tag 'origami', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= javascript_include_tag 'origami', 'data-turbolinks-track': 'reload' %> diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 35a46907..9e406ede 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -21,23 +21,23 @@
    - <% - @booking_orders.each do |bko| + <% + @booking_orders.each do |bko| # Assigned Id for new Order? Sale? unique_id="" # For CSS- Class for Order? Sale? sale_status="" - if bko.order_status == 'new' + if bko.order_status == 'new' unique_id=bko.booking_id - else + else unique_id=bko.sale_id sale_status="sold" - end + end %>
    - -

    <%= bko.table_name %>

    + +

    <%= bko.table_name %>

    Receipt No : @@ -48,12 +48,12 @@ Order Status : <%= bko.order_status %> - + -

    -
    -
    - <% +

    +
    +
    + <% end %> @@ -62,23 +62,23 @@
    - <% - @booking_rooms.each do |rmo| + <% + @booking_rooms.each do |rmo| # Assigned Id for new Order? Sale? unique_id="" # For CSS- Class for Order? Sale? sale_status="" - if rmo.order_status == 'new' - unique_id=rmo.booking_id - else + if rmo.order_status == 'new' + unique_id=rmo.booking_id + else unique_id=rmo.sale_id sale_status="sold" - end + end %>
    - -

    <%= rmo.room_name %>

    + +

    <%= rmo.room_name %>

    Receipt No : @@ -89,12 +89,12 @@ Order Status : <%= rmo.order_status %> - + -

    -
    -
    - <% +

    +
    +
    + <% end %> @@ -103,23 +103,23 @@
    - <% - @orders.each do |odr| + <% + @orders.each do |odr| # Assigned Id for new Order? Sale? unique_id="" # For CSS- Class for Order? Sale? sale_status="" - if odr.order_status == 'new' + if odr.order_status == 'new' unique_id=odr.booking_id - else + else unique_id=odr.sale_id sale_status="sold" - end + end %>
    - -

    <%= odr.table_name %>

    + +

    <%= odr.table_name %>

    Receipt No : @@ -130,16 +130,16 @@ Order Status : <%= odr.order_status %> - + -

    -
    -
    - <% +

    +
    +
    + <% end %> - + @@ -157,10 +157,10 @@

    Receipt No:

    Cashier:

    -
    +

    Date:

    -
    +
    @@ -205,7 +205,7 @@
    - + @@ -215,13 +215,13 @@ - + - + - + diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index 404306e7..5cf1bfd4 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -1,15 +1,15 @@
    - +
    <% @payment_method_setting.each do |payment_method|%>
    <%= payment_method.payment_method %>
    - <% end %> + <% end %>
    - +
    +
    0.0
    -
    +
    @@ -86,16 +86,16 @@
    -
    PAY
    +
    PAY
    - +
    - +
    \ No newline at end of file + diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index fcdee809..f16ef927 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -78,7 +78,7 @@
    CASH
    -
    0.0
    +
    <%= @cash %>
    @@ -165,42 +165,43 @@