conflict data

2018-05-28 10:46:04 +06:30
parent 597bab756f 7ddbd7d78a
commit c4cefb05ae
8 changed files with 347 additions and 8 deletions
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -63,6 +63,8 @@ class Oqs::EditController < BaseOqsController
                  unique_code="OrderItemCustomisePdf"
                elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf'
                  unique_code="OrderSetItemCustomisePdf"  
+                elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
+                  unique_code="OrderItemSlimCustomisePdf"
                end  
              end
            end