Merge branch 'adminbsb_material_ui'

This commit is contained in:
Aung Myo
2018-07-23 12:06:59 +06:30
2 changed files with 8 additions and 2 deletions

View File

@@ -936,6 +936,8 @@
confirmButtonText: "Yes, print it!", confirmButtonText: "Yes, print it!",
closeOnConfirm: false closeOnConfirm: false
}, function (isConfirm) { }, function (isConfirm) {
$('.confirm').off("click touchstart touchend");
$('.confirm').attr("disabled","disabled");
if (isConfirm) { if (isConfirm) {
var sale_id = $('#sale_id').val(); var sale_id = $('#sale_id').val();
var ajax_url = "/origami/sale/" + sale_id + "/first_bill"; var ajax_url = "/origami/sale/" + sale_id + "/first_bill";

View File

@@ -473,8 +473,8 @@
end end
%> %>
</table> </table>
<button class='btn bg-primary btn-block' id='add_invoice'> Add to existing invoice </button> <button class='btn bg-primary btn-block' id='add_invoice'> Add to existing invoice </button>-->
<% end %> --> <% end %>
<% if @sale_array.size > 1 %> <% if @sale_array.size > 1 %>
<br><br> <br><br>
Pending Payment Pending Payment
@@ -1024,6 +1024,10 @@ $("#first_bill").on('click', function(){
confirmButtonText: "Yes, print it!", confirmButtonText: "Yes, print it!",
closeOnConfirm: false closeOnConfirm: false
}, function (isConfirm) { }, function (isConfirm) {
$('.confirm').off("click touchstart touchend");
$('.confirm').attr("disabled","disabled");
if (isConfirm) { if (isConfirm) {
var sale_id = $('#sale_id').val(); var sale_id = $('#sale_id').val();
var ajax_url = "/origami/sale/"+ sale_id + "/first_bill"; var ajax_url = "/origami/sale/"+ sale_id + "/first_bill";