conflit modified changes

2018-05-25 17:44:36 +06:30
parent 1ae55f1af2 578c14ccc3
commit 7ddbd7d78a
11 changed files with 584 additions and 414 deletions
--- a/app/pdf/order_item_slim_customise_pdf.rb
+++ b/app/pdf/order_item_slim_customise_pdf.rb
@@ -8,7 +8,7 @@ class OrderItemSlimCustomisePdf < Prawn::Document
    self.item_font_size = print_settings.item_font_size.to_i
    self.margin = 0
    self.price_width = 40 # No Need for item
-    self.qty_width = 40
+    self.qty_width = 25
    self.total_width = 40  # No Need for item
    self.item_width = self.page_width - (self.qty_width - self.margin)
    self.item_height = 15