fixed conflit

app/views/origami/shifts/show.html.erb

@@ -26,7 +26,7 @@
         <div class='col-md-6'>
           <span style='font-size:20px;'><b><input type='number' class="form-control" id='closing_balance_amount' value='' onkeypress="return isNumberKey(event);" onkeyup="closeCashier(this.value);"></b></span>
         </div>
-      </div>
+      </div><br>
     </div>
     <div class="col-lg-2 col-md-2 col-sm-2">
     <button type="button" class="btn bg-default btn-block" id='back'><i class="material-icons">reply</i> <%= t("views.btn.back") %> </button>
@@ -59,6 +59,13 @@
 </div>
 <script>
 
+  // $(document).ready(function(){
+  //   var val = $('#sale_items').val()
+  //   if (val == 1) {
+  //     $('#sale_items').prop( "checked", true );
+  //   }
+  // })
+
   function closeCashier(val){
     var aa = parseInt(val);
     if(isNaN(aa)) $("#closing_balance_amount").val("");
@@ -81,9 +88,10 @@
   $('#close_cashier').on('click',function(){
     var amount = $('#closing_balance_amount').val();
     var shift_id = "<%= @shift.id rescue ""%>"
+
     $.ajax({type: "POST",
       url: "<%= origami_close_shift_path %>",
-      data: "closing_balance="+ amount + "&shift_id="+ shift_id,
+      data: "closing_balance="+ amount + "&shift_id="+ shift_id ,
       success:function(result){
         console.log(result)
         window.location.href = '/';

app/views/print_settings/_form.html.erb

@@ -27,6 +27,22 @@
           <%= f.input :precision, input_html: { min: 0, max: 2, :onkeypress => "return isNumberKey(event);", :onkeyup => "greaterThanTwo(this.value);" } %>
           <%= f.input :delimiter %>
           <%= f.input :heading_space %>
+
+          <% if !@print_setting.new_record? and @print_setting.unique_code == 'CloseCashierPdf' %>
+          <div class="form-group boolean optional sale_items bmd-form-group is-filled">
+            <div class="checkbox">
+              <input value="0" type="hidden" name="shift_sale_items">
+              <label class="boolean optional" for="sale_items">
+                <input class="boolean optional" type="checkbox" value="<%= @lookup %>" name="shift_sale_items" id="sale_items" onchange="set_value(this)">
+                <span class="checkbox-decorator">
+                  <span class="check"></span>
+                  <div class="ripple-container"></div>
+                </span>Shift Sale Items
+              </label>
+            </div>
+          </div>
+          <% end %>
+
         </div>
 
         <div class="form-actions">
@@ -82,7 +98,11 @@
                       .attr("value",value.target)
                       .text(value.deviceName)); 
       }); 
-    } 
+    }
+
+    if ($('#sale_items').val() == '1') {
+      $('#sale_items').prop('checked', true);
+    }
 
       // if selected printer change call and bind 
       $("#print_setting_printer_name").on("change", function(){        
@@ -119,4 +139,12 @@
   function greaterThanTwo(val){
     if(parseInt(val)>2) $("#print_setting_precision").val(2);
   }
+
+  function set_value(ele){
+    if ($(ele).val() == '1'){
+      $(ele).val(0)
+    }else{
+      $(ele).val(1)
+    }
+  }
 </script>

app/views/print_settings/show.html.erb

@@ -58,6 +58,16 @@
               <th><%= t("views.right_panel.detail.print_copies") %></th>
               <td><%= @print_setting.print_copies %></td>
             </tr>
+            <tr>
+              <th>Include Shift Sale Items</th>
+              <td>
+                <% if @lookup == '1' %>
+                <%= 'True' %>
+                <% else %>
+                <%= 'False' %>
+                <% end %>
+              </td>
+            </tr>
             <tr>
               <td colspan="2" align="right">
                 <%= link_to t("views.btn.edit"), edit_print_setting_path(@print_setting),:class => 'btn btn-info btn-sm waves-effect' %>

app/views/reports/saleitem/index.html.erb

@@ -15,8 +15,9 @@
 		<hr />
 
 		<div class="text-right">
+			<%= link_to "Print", reports_print_sale_items_path(:type => params[:sale_type], :period => params[:period], :account => params[:account_type], :from => @from, :to => @to, :shift_name => params[:shift_name], :shift_from => @shift_from, :shift_to => @shift_to, :menu_cate_count => @menu_cate_count, :sale_items => @sale_data.to_json), :method => 'post', class:"btn btn-info wave-effects" %>
 			<a href="javascript:export_to('<%=reports_saleitem_index_path%>.xls')" class = "btn btn-info wave-effects "><%= t("views.btn.exp_to_excel") %></a>
-		</div>	  			
+		</div>
 
 		<div class="margin-top-20">
 			<div class="card">