From 836e32ed242f1d02c3d3daa7b742267220dc6917 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 5 Jul 2017 10:54:46 +0630
Subject: [PATCH 1/4] bitp order margin

---
 app/pdf/order_item_pdf.rb    |   2 +-
 app/pdf/order_summary_pdf.rb |   2 +-
 dump.rdb                     | Bin 819 -> 785 bytes
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 03ed4d21..b71944e3 100644
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -4,7 +4,7 @@ class OrderItemPdf < Prawn::Document
   def initialize(print_settings,order_item, print_status, options, alt_name)
     self.page_width = 180
     self.page_height = 1450
-    self.margin = 5
+    self.margin = 0
     self.price_width = 40 # No Need for item
     self.qty_width = 30
     self.total_width = 40  # No Need for item
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index 9ee459c8..c1762b17 100644
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -4,7 +4,7 @@ class OrderSummaryPdf < Prawn::Document
   def initialize(print_settings,order, print_status, order_items = nil,alt_name)
     self.page_width = 180
     self.page_height = 1450
-    self.margin = 5
+    self.margin = 0
     self.price_width = 40 # No Need for item
     self.qty_width = 30
     self.total_width = 40  # No Need for item
diff --git a/dump.rdb b/dump.rdb
index aca182bf7f2ecfa3ade1bae644ed3807faecd011..3ac76616489702d977f385c88e55f5c87c543053 100644
GIT binary patch
delta 105
zcmdnYHj!<DfyAx8=*V9jrNyZ!y1A*jhdiR$8U8W+7Gj+IkV$M}+*KeYGC7k`oaZ3Z
zpTiHA@y0STFtALvXB3lUVM$6&ED<s^v9vTaH!?Ld)3dNJGB>d>*}R)EkC997e?%Ma
J(#D!nQ2@ZgBI^JE

delta 116
zcmV-)0E_>T2D1i`Fc|xdTUq)Db#rB8Ep26O!jSJ40R8~`69JRI0v3^8)gl53aB^>B
zWpi_7a{(23VQxA&H#s;uGi76DVPa-vF<~-hlQRJ;2EYRR@`a<5WC1D*Gc-0XH#Rvk
WH#s%4nE`GA3N8Q7>>!0irRZwxNh-Dg


From 15e0caa12d04152dc705caa9934d318da166c25f Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 5 Jul 2017 10:57:45 +0630
Subject: [PATCH 2/4] comment clear data rake

---
 lib/tasks/clear_data.rake | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake
index affe76ff..d0bf6ceb 100644
--- a/lib/tasks/clear_data.rake
+++ b/lib/tasks/clear_data.rake
@@ -1,19 +1,19 @@
 namespace :clear do
-  desc "Clear Data"
-  task :data => :environment do
-    BookingOrder.delete_all
-    Booking.delete_all
-    OrderItem.delete_all
-    AssignedOrderItem.delete_all
-    Order.delete_all
-    SaleOrder.delete_all
-    SaleItem.delete_all
-    Sale.delete_all
-    SaleAudit.delete_all
-    SalePayment.delete_all
-    ShiftSale.delete_all
-    PaymentJournal.delete_all
-    DiningFacility.update_all(status:'available')
-    puts "Clear Data Done."
-  end
+  # desc "Clear Data"
+  # task :data => :environment do
+  #   BookingOrder.delete_all
+  #   Booking.delete_all
+  #   OrderItem.delete_all
+  #   AssignedOrderItem.delete_all
+  #   Order.delete_all
+  #   SaleOrder.delete_all
+  #   SaleItem.delete_all
+  #   Sale.delete_all
+  #   SaleAudit.delete_all
+  #   SalePayment.delete_all
+  #   ShiftSale.delete_all
+  #   PaymentJournal.delete_all
+  #   DiningFacility.update_all(status:'available')
+  #   puts "Clear Data Done."
+  # end
 end

From a9f9f108994f7ae804fb0a641a867d6dd1645819 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 5 Jul 2017 11:16:16 +0630
Subject: [PATCH 3/4] cash click prevent

---
 app/views/origami/payments/show.html.erb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 86738c22..77bda01b 100644
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -320,6 +320,9 @@ $(document).on('click', '.cashier_number', function(event){
 });
 
 $( document ).ready(function() {
+  // Disable click event cash to prevent
+  $(".payment .cash-color").off('click');
+
   $('#credit_payment').click(function() {
     var sale_id = $('#sale_id').text();
      window.location.href = '/origami/sale/'+ sale_id  + "/payment/credit_payment"

From 02023b106071bbd295f413d2193c3ba1e901d30e Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 5 Jul 2017 11:54:22 +0630
Subject: [PATCH 4/4] add fonts in gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 91a498bc..5dafee53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,6 @@ config/deploy/config/*
 
 # For Redis Server log file
 dump.rdb
+
+# Fonts 
+public/fonts/*