From 26f2dce14232c83d5d0a03619d39354e1d048f78 Mon Sep 17 00:00:00 2001 From: Moe Su Date: Thu, 8 Jun 2017 09:53:04 +0630 Subject: [PATCH] For Pull --- Gemfile | 2 +- .../origami/others_payments_controller.rb | 6 +++- app/controllers/origami/paypar_controller.rb | 3 +- app/models/order.rb | 1 - .../origami/others_payments/index.html.erb | 27 ++++++++++++++--- app/views/origami/payments/show.html.erb | 28 +++++++++--------- .../{paypar => paypar_payment}/index.html.erb | 0 ...ts.rb => 2017031024747_create_accounts.rb} | 0 db/seeds.rb | 10 +++---- dump.rdb | Bin 10166 -> 12286 bytes 10 files changed, 50 insertions(+), 27 deletions(-) rename app/views/origami/{paypar => paypar_payment}/index.html.erb (100%) rename db/migrate/{20170531024747_create_accounts.rb => 2017031024747_create_accounts.rb} (100%) diff --git a/Gemfile b/Gemfile index 8081f3b5..145cd5c1 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem 'rails', '~> 5.1.0' # gem 'mysql2', '>= 0.3.18', '< 0.5' #Use PosgreSQL -#gem 'pg' +gem 'pg' # redis server for cable # gem 'redis', '~> 3.0' diff --git a/app/controllers/origami/others_payments_controller.rb b/app/controllers/origami/others_payments_controller.rb index 1542734a..fa50f6a3 100644 --- a/app/controllers/origami/others_payments_controller.rb +++ b/app/controllers/origami/others_payments_controller.rb @@ -3,7 +3,10 @@ class Origami::OthersPaymentsController < BaseOrigamiController def index @membership_rebate_balance = 0 - @membership_id = 0 + @sale_id = params[:sale_id] + sale_data = Sale.find_by_sale_id(@sale_id) + customer_data= Customer.find_by_customer_id(sale_data.customer_id) + @membership_id = customer_data.membership_id if !@membership_id.nil? membership_setting = MembershipSetting.find_by_membership_type("smartpay_url") membership_data = SalePayment.get_paypar_account(membership_setting.gateway_url,membership_setting.auth_token,@membership_id) @@ -19,6 +22,7 @@ class Origami::OthersPaymentsController < BaseOrigamiController else @membership_rebate_balance = 0 end + end end def create diff --git a/app/controllers/origami/paypar_controller.rb b/app/controllers/origami/paypar_controller.rb index 428cbc87..06be6434 100644 --- a/app/controllers/origami/paypar_controller.rb +++ b/app/controllers/origami/paypar_controller.rb @@ -1,3 +1,4 @@ class Origami::PayparController < ApplicationController - + def create + end end diff --git a/app/models/order.rb b/app/models/order.rb index 4ddad631..04c9645e 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -271,7 +271,6 @@ class Order < ApplicationRecord left join sale_orders on sale_orders.order_id = orders.order_id left join sales on sales.sale_id = sale_orders.sale_id") .where("dining_facilities.is_active=? and orders.date between ? and ?",true,from,to) - .group("orders.order_id,order_items.order_items_id,dining_facilities.name,sales.receipt_no,bookings.booking_id,sales.sale_id") end diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb index 859a854b..6a72fc2d 100644 --- a/app/views/origami/others_payments/index.html.erb +++ b/app/views/origami/others_payments/index.html.erb @@ -4,7 +4,7 @@
<% if @membership_id!=0 %>
-
Redim Amount
+
Redim Amount
<% end %>
@@ -86,7 +86,7 @@
-
PAY
+
PAY
@@ -123,6 +123,9 @@ $(document).on('click', '.cashier_number', function(event){ $('#used_amount').html(amount); break; + case 'clr': + $('#used_amount').html("0.0"); + break; } event.handled = true; @@ -131,7 +134,23 @@ $(document).on('click', '.cashier_number', function(event){ } }); - $("#redim").click(function(){ +$("#redeem_account").click(function(){ $('.rebate-form').removeAttr("hidden"); - }) +}); + +$("#redeem").click(function(){ + valid_amount = $("#valid_amount").val(); + sale_id = $(this).attr("data-value") + membership_id = $(this).attr("data-member-value"); + used_amount = parseInt($("#used_amount").text()); + if(used_amount<=0){ + alert(" Insufficient Amount!") + }else if(valid_amount< used_amount){ + alert("Please type valid amount"); + }else{ + $.ajax({ + + }) + } +}); \ 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 ccd9fd77..fcdee809 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -218,21 +218,21 @@ $( document ).ready(function() { $('#pay').click(function() { - if($('#balance').text() > 0){ - alert(" Insufficient Amount!") - }else{ + if($('#balance').text() > 0){ + alert(" Insufficient Amount!") + }else{ // payment - var cash = $('#cash').text(); - var credit = $('#credit').text(); - var card = $('#card').text(); - var sale_id = $('#sale_id').text(); - $.ajax({type: "POST", - url: "<%= origami_payment_process_path %>", - data: "cash="+ cash + "&sale_id=" + sale_id, - success:function(result){ - alert("THANK YOU") - } - }); + var cash = $('#cash').text(); + var credit = $('#credit').text(); + var card = $('#card').text(); + var sale_id = $('#sale_id').text(); + $.ajax({type: "POST", + url: "<%= origami_payment_process_path %>", + data: "cash="+ cash + "&sale_id=" + sale_id, + success:function(result){ + alert("THANK YOU") + } + }); } }); diff --git a/app/views/origami/paypar/index.html.erb b/app/views/origami/paypar_payment/index.html.erb similarity index 100% rename from app/views/origami/paypar/index.html.erb rename to app/views/origami/paypar_payment/index.html.erb diff --git a/db/migrate/20170531024747_create_accounts.rb b/db/migrate/2017031024747_create_accounts.rb similarity index 100% rename from db/migrate/20170531024747_create_accounts.rb rename to db/migrate/2017031024747_create_accounts.rb diff --git a/db/seeds.rb b/db/seeds.rb index 78d927a4..0d5d2804 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -141,9 +141,9 @@ admin_employee = Employee.create({name: "Administrator", role: "Administrator", food = Account.create({title: "Food", account_type: "0"}) beverage = Account.create({title: "Beverage", account_type: "1"}) -shop = Shop.create( - {name: "Beauty In The Pot", address: "address", township: "Yangon", city: "Yangon", state: "Yangon", - country: "Myanmar", phone_no: "09123456789", reservation_no: "bip000001", license: "license", - activated_at: "2017-06-06", license_data: "license_data", base_currency: "Ks", id_prefix: "abc"} - ) +# shop = Shop.create( +# {name: "Beauty In The Pot", address: "address", township: "Yangon", city: "Yangon", state: "Yangon", +# country: "Myanmar", phone_no: "09123456789", reservation_no: "bip000001", license: "license", +# activated_at: "2017-06-06", license_data: "license_data", base_currency: "Ks", id_prefix: "abc"} +# ) diff --git a/dump.rdb b/dump.rdb index 61ec8a21c31c38ba1e142be5d08c0b8068a0ba59..b2fb17094c22aaa8265a1d8b89c59387f484057f 100644 GIT binary patch literal 12286 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 N|MAB+U-`Cc^55=UR1p9G