From e17091ac06298fe7f25a2f05fdc5f805cf569728 Mon Sep 17 00:00:00 2001
From: Myat Zin Wai Maw <myatzin@code2lab.com>
Date: Wed, 26 Feb 2020 17:09:17 +0630
Subject: [PATCH] syntax

---
 app/models/menu_category.rb |  2 +-
 app/models/menu_item.rb     |  2 +-
 app/pdf/order_item_pdf.rb   | 21 +++++++++++++++------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb
index 128b8850..99b78c6c 100755
--- a/app/models/menu_category.rb
+++ b/app/models/menu_category.rb
@@ -7,7 +7,7 @@ class MenuCategory < ApplicationRecord
   has_many :menu_items
 
   validates_presence_of :code, :name, :menu, :order_by
-  validate_uniqueness_of :code, scope: shop_code
+  validates_uniqueness_of :code, scope: :shop_code
 
   default_scope { order('order_by asc') }
   scope :active, -> {where("is_available = 1")}
diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb
index 8a1fb5b1..84270615 100755
--- a/app/models/menu_item.rb
+++ b/app/models/menu_item.rb
@@ -14,7 +14,7 @@ class MenuItem < ApplicationRecord
   has_and_belongs_to_many :item_sets, join_table: "menu_item_sets"
 
   validates_presence_of :item_code, :name, :type, :min_qty,:account_id
-  validate_uniqueness_of :item_code, scope: shop_code
+  validates_uniqueness_of :item_code, scope: :shop_code
 
   default_scope { order('item_code asc') }
 
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 0d5c769a..aaa034f1 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -36,15 +36,24 @@ class OrderItemPdf < Prawn::Document
    # font "public/fonts/padauk.ttf"
    #font "public/fonts/Chinese.ttf"
    if order_item.source =='app'
-     text "Mobile Order", :size => self.header_font_size,:align => :left
+     text "Mobile Order", :size => self.header_font_size,:align => :center, :style=>:bold
      move_down 1
-     text "Customer Ph  : #{order_item.contact_no}", :size => self.header_font_size,:align => :left
+     y_position = cursor
+     bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
+       text "#{order_item.contact_no}", :size => self.header_font_size,:align => :left
+     end
+     if !order_item.dining.nil?
+       bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
+         text "#{ order_item.type + '-' + order_item.dining + print_status }" , :size => self.header_font_size,:align => :right
+       end
+     end
      move_down 1
-   end
-   if !order_item.dining.nil?
-     text "#{ order_item.type + '-' + order_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
    else
-     text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+     if !order_item.dining.nil?
+       text "#{ order_item.type + '-' + order_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+     else
+       text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+     end
    end
 
    stroke_horizontal_rule