From 098ea8e9317b630969ed3bce4d36375d51f4d5a6 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 20 Feb 2018 18:15:55 +0630 Subject: [PATCH 1/3] update edit form --- app/assets/stylesheets/addorder.scss | 3 + app/views/origami/sale_edit/edit.html.erb | 115 ++++++++++++++++++---- 2 files changed, 98 insertions(+), 20 deletions(-) diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss index bf09f726..be126395 100755 --- a/app/assets/stylesheets/addorder.scss +++ b/app/assets/stylesheets/addorder.scss @@ -62,6 +62,9 @@ section .content{ .nav-tabs { background-color: #eeeeee; } +.nav-tabs .nav-link { + padding: 0.7286rem 0.2575 +} .nav-tabs .nav-link.active, .nav-tabs .nav-item.show .nav-link { background-color: #fff; border-left: 6px solid #111; diff --git a/app/views/origami/sale_edit/edit.html.erb b/app/views/origami/sale_edit/edit.html.erb index 1aaa02ca..7372e116 100755 --- a/app/views/origami/sale_edit/edit.html.erb +++ b/app/views/origami/sale_edit/edit.html.erb @@ -1,7 +1,7 @@
-
+
INVOICE DETAILS
@@ -29,12 +29,12 @@ - + - + @@ -53,46 +53,46 @@ unless sale_item.price == 0 %> - - + <% if sale_item.remark != 'void' && sale_item.remark != 'edit' && sale_item.remark != 'foc' %> - - - <% elsif sale_item.qty.to_i < 0 || sale_item.remark == 'edit' %> - - - <% else %> - - @@ -108,7 +108,7 @@
## ItemsQTY - - Price - + QTY + Price + Action
<%= count %> + <%= count %> <%= sale_item.product_name %> + + + + + + + +
- + @@ -117,12 +117,42 @@ - +
+
+
+
+
1
+
2
+
3
+
+
+
4
+
5
+
6
+
+
+
7
+
8
+
9
+
+
+
0
+
.
+
00
+
+
+
Nett
+
Del
+
Clr
+
+
+
+
-
+
- +
@@ -225,4 +255,49 @@ } }); }) + + $( "input" ).focusin(function() { + $('.addfocus').removeClass('addfocus'); + $( this ).addClass('addfocus'); + }); + + $(".cashier_number").on('click', function(event){ + if(event.handled !== true) { + + var original_value=''; + // original_value = $('.addfocus').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"){ + $('.addfocus').val(input_value); + } + else{ + $('.addfocus').val(original_value + '' + input_value); + } + break; + + case 'add': + var input_value = $(this).attr("data-value"); + amount = parseInt(input_value); + $('.addfocus').val(amount); + break; + + case 'del' : + var discount_text=$('.addfocus').val(); + $('.addfocus').val(discount_text.substr(0,discount_text.length-1)); + break; + + case 'clr': + $('.addfocus').val(""); + break; + } + event.handled = true; + } else { + return false; + } + }); From ebdf838b520ac37346b061ab24beae69375e0786 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 21 Feb 2018 13:12:41 +0630 Subject: [PATCH 2/3] update request sale for another role --- app/models/sale.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/models/sale.rb b/app/models/sale.rb index f07a8a2f..f0166491 100755 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -82,16 +82,17 @@ class Sale < ApplicationRecord current_shift = ShiftSale.current_shift shift = ShiftSale.current_open_shift(cashier.id) - # set cashier + # set cashier if shift != nil self.cashier_id = cashier.id self.cashier_name = cashier.name self.shift_sale_id = shift.id else - if open_cashier.nil? - self.cashier_id = requested_by.id - self.cashier_name = requested_by.name - self.shift_sale_id = current_shift.id + if open_cashier.count>0 + self.cashier_id = open_cashier[0].id + self.cashier_name = open_cashier[0].name + shift_id = ShiftSale.current_open_shift(open_cashier[0].id) + self.shift_sale_id = shift_id.id else self.cashier_id = current_shift.employee_id self.cashier_name = Employee.find(current_shift.employee_id).name @@ -99,6 +100,7 @@ class Sale < ApplicationRecord end end + # set waiter self.requested_by = requested_by.name From f206df7c384d43eae2f8454a72a7cb87efc391d3 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 21 Feb 2018 13:16:47 +0630 Subject: [PATCH 3/3] update edit form --- app/views/origami/sale_edit/edit.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/origami/sale_edit/edit.html.erb b/app/views/origami/sale_edit/edit.html.erb index 7372e116..940b497a 100755 --- a/app/views/origami/sale_edit/edit.html.erb +++ b/app/views/origami/sale_edit/edit.html.erb @@ -1,7 +1,7 @@
-
+
INVOICE DETAILS
@@ -117,7 +117,7 @@
-
+
@@ -265,7 +265,7 @@ if(event.handled !== true) { var original_value=''; - // original_value = $('.addfocus').val(); + original_value = $('.addfocus').val(); var input_type = $(this).attr("data-type");
Sub Total:Sub Total: <%= sub_total %>