git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove conflict

Browse Source
This commit is contained in:
phyusin
2018-05-28 10:52:51 +06:30
parent c4cefb05ae
commit 0ff21a88cd
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/order_queue_station.rb
View File

@@ -220,13 +220,10 @@ class OrderQueueStation < ApplicationRecord
unique_code="OrderSummarySetPdf" unique_code="OrderSummarySetPdf"
elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf' elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf'
unique_code="OrderSummaryCustomisePdf" unique_code="OrderSummaryCustomisePdf"
<<<<<<< HEAD
elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf' elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf'
unique_code="OrderSummarySetCustomisePdf" unique_code="OrderSummarySetCustomisePdf"
=======
elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf' elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
unique_code="OrderSummarySlimCustomisePdf" unique_code="OrderSummarySlimCustomisePdf"
>>>>>>> 7ddbd7d78a644d6f6bd2c0bffab1a46f69bae23c
end end
end end
end end
@@ -258,13 +255,10 @@ class OrderQueueStation < ApplicationRecord
unique_code="OrderSetItemPdf" unique_code="OrderSetItemPdf"
elsif printer_setting.unique_code == 'OrderItemCustomisePdf' elsif printer_setting.unique_code == 'OrderItemCustomisePdf'
unique_code="OrderItemCustomisePdf" unique_code="OrderItemCustomisePdf"
<<<<<<< HEAD
elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf' elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf'
unique_code="OrderSetItemCustomisePdf" unique_code="OrderSetItemCustomisePdf"
=======
elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf' elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
unique_code="OrderItemSlimCustomisePdf" unique_code="OrderItemSlimCustomisePdf"
>>>>>>> 7ddbd7d78a644d6f6bd2c0bffab1a46f69bae23c
end end
end end
end end