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

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Yan
2018-04-19 15:18:11 +06:30
parent 3db2db093b e468bc65af
commit 527cafc772
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/origami/dinga/index.html.erb
View File

@@ -118,7 +118,7 @@
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<input type="hidden" name="paypar_account_no" id="paypar_account_no" value="1011002923682533" /> <input type="hidden" name="paypar_account_no" id="paypar_account_no" />
<input type="hidden" name="qr_code" id="qr_code" /> <input type="hidden" name="qr_code" id="qr_code" />
<div class="row text-center m-t-20"> <div class="row text-center m-t-20">
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6"> <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6">
@@ -325,9 +325,10 @@
var customer_name = ''; var customer_name = '';
var membership_id = ''; var membership_id = '';
var membership_type = ''; var membership_type = '';
var receipt_no = $("#receipt_no").text() || 0;
setTimeout(function(){ setTimeout(function(){
code=getQRCode(); code=getQRCode();
if(sale_id != 0 && code != ""){ if(sale_id != 0 && code != ""){
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: "/origami/"+sale_id+"/send_account" , url: "/origami/"+sale_id+"/send_account" ,
@@ -343,6 +344,7 @@
url: "<%=origami_payment_paymal_path%>", url: "<%=origami_payment_paymal_path%>",
data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no:code}, data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no:code},
success: function(result){ success: function(result){
if(result.status == true){ if(result.status == true){
swal({ swal({
title: "Information!", title: "Information!",

2
app/views/origami/paymal/index.html.erb
View File

@@ -328,6 +328,7 @@
var payment_amount = parseFloat($("#used_amount").text()); var payment_amount = parseFloat($("#used_amount").text());
setTimeout(function(){ setTimeout(function(){
code=getQRCode(); code=getQRCode();
alert(code)
if(sale_id != 0 && code != ""){ if(sale_id != 0 && code != ""){
$.ajax({ $.ajax({
type: "POST", type: "POST",
@@ -344,6 +345,7 @@
url: "<%=origami_payment_paymal_path%>", url: "<%=origami_payment_paymal_path%>",
data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no:code}, data: {payment_amount:payment_amount,membership_id:0,sale_id:sale_id,transaction_ref:data.transaction_ref,account_no:code},
success: function(result){ success: function(result){
alert(result)
if(result.status == true){ if(result.status == true){
swal({ swal({
title: "Information!", title: "Information!",

2
config/secrets.yml
View File

@@ -24,7 +24,7 @@ test:
# instead read values from the environment. # instead read values from the environment.
production: production:
secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22 secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22
sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api sx_provision_url: https://connect.pos-myanmar.com/api #192.168.1.147:3002/api
server_mode: application server_mode: application
cipher_type: AES-256-CBC cipher_type: AES-256-CBC
sx_key: Wh@t1$C2L sx_key: Wh@t1$C2L

2
db/migrate/20170626191519_create_shift_sales.rb
View File

@@ -21,7 +21,7 @@ class CreateShiftSales < ActiveRecord::Migration[5.1]
t.integer :dining_count, :default => 0 t.integer :dining_count, :default => 0
t.integer :takeaway_count, :default => 0 t.integer :takeaway_count, :default => 0
t.integer :member_count, :default => 0 t.integer :member_count, :default => 0
t.decimal :total_rounding,, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.decimal :total_rounding, :precision => 10, :scale => 2, :null => false, :default => 0.00
t.integer :total_receipt, :default => 0 t.integer :total_receipt, :default => 0
t.decimal :total_void, :default => 0 t.decimal :total_void, :default => 0
t.timestamps t.timestamps