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

.gitignore

@@ -48,3 +48,6 @@ config/deploy/config/*
 
 # For Redis Server log file
 dump.rdb
+
+# Fonts 
+public/fonts/*

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

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

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"

lib/tasks/clear_data.rake

@@ -1,19 +1,19 @@
 namespace :clear do
-  desc "Clear Data"
+  # desc "Clear Data"
-  task :data => :environment do
+  # task :data => :environment do
-    BookingOrder.delete_all
+  #   BookingOrder.delete_all
-    Booking.delete_all
+  #   Booking.delete_all
-    OrderItem.delete_all
+  #   OrderItem.delete_all
-    AssignedOrderItem.delete_all
+  #   AssignedOrderItem.delete_all
-    Order.delete_all
+  #   Order.delete_all
-    SaleOrder.delete_all
+  #   SaleOrder.delete_all
-    SaleItem.delete_all
+  #   SaleItem.delete_all
-    Sale.delete_all
+  #   Sale.delete_all
-    SaleAudit.delete_all
+  #   SaleAudit.delete_all
-    SalePayment.delete_all
+  #   SalePayment.delete_all
-    ShiftSale.delete_all
+  #   ShiftSale.delete_all
-    PaymentJournal.delete_all
+  #   PaymentJournal.delete_all
-    DiningFacility.update_all(status:'available')
+  #   DiningFacility.update_all(status:'available')
-    puts "Clear Data Done."
+  #   puts "Clear Data Done."
-  end
+  # end
 end