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

update dinga and paymal

Browse Source
This commit is contained in:
Aung Myo
2018-04-26 13:07:31 +06:30
parent 9b0a564b9a
commit 3a85481dcd
9 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/views/origami/addorders/detail.html.erb
View File

@@ -490,11 +490,13 @@
</div>
</div>
<% end %>
<style type="text/css">
.fadeInRight{
-webkit-animation-duration: 350ms !important;
}
</style>
<input type="hidden" name="server_mode" value="<%=ENV["SERVER_MODE"]%>" id="server_mode">
<style type="text/css">
.fadeInRight{
-webkit-animation-duration: 350ms !important;
}
</style>
<script>
jQuery(function(){
id = "<%=@menu[0].id%>";

5
app/views/origami/dashboard/index.html.erb
View File

@@ -199,6 +199,7 @@
<% end %>
</div>
<button type="button" data-href="<%=origami_second_display_index_path%>" target="_blank" id="second_view" class="btn action-btn bg-blue waves-effect second_view hidden" style="height: 45px">Customer View</button>
<input type="hidden" name="server_mode" value="<%=ENV["SERVER_MODE"]%>" id="server_mode">
<script>
$(".cashier_view").on('click', function() {
@@ -206,7 +207,9 @@
});
$(".qs_view").on('click', function() {
document.getElementById('second_view').click();
if ($('#server_mode').val() != "cloud") {
document.getElementById('second_view').click();
}
window.location.href = '/origami/quick_service';
});

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

@@ -287,7 +287,7 @@
});
}else{
swal ( "Information" , result.message);
swal ( "Opps",result.message ,"warning" );
}
}
});
@@ -364,7 +364,7 @@
});
}else{
swal ( "Information" , result.message);
swal ( "Opps",result.message ,"warning" );
}
}
});

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

@@ -281,7 +281,7 @@
});
}else{
swal ( "Information" , result.message);
swal ( "Opps",result.message ,"warning" );
}
}
});
@@ -328,7 +328,6 @@
var payment_amount = parseFloat($("#used_amount").text());
setTimeout(function(){
code=getQRCode();
alert(code)
if(sale_id != 0 && code != ""){
$.ajax({
type: "POST",
@@ -345,7 +344,6 @@
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},
success: function(result){
alert(result)
if(result.status == true){
swal({
title: "Information!",
@@ -359,7 +357,7 @@
});
}else{
swal ( "Information" , result.message);
swal ( "Opps",result.message ,"warning" );
}
}
});