fix conflit

app/views/settings/promotions/_form.html.erb

@@ -39,9 +39,18 @@
             <% end %>
           </div>
         </div>
-        <div class="row">
-          <div class="col-md-12"><%= f.input :promo_day %></div>
+
+        <div class="row checkboxes">
+         <%= f.hidden_field :promo_day, :value => "", :class => "form-control col-md-1" %> 
+          <div class="col-md-1"><input class="select" type="checkbox" name="Sunday" value="0" id="0"> Sun</div>
+          <div class="col-md-1"><input class="select" type="checkbox" name="Monday" value="1" id="1">Mon</div>
+          <div class="col-md-1"><input class="select" type="checkbox" name="Tuesday" value="2" id="2"> Tue</div>
+          <div class="col-md-1"><input class="select" type="checkbox" name="Wednesday" value="3" id="3"> Wed</div>
+          <div class="col-md-1"><input class="select" type="checkbox" name="Thursday" value="4" id="4">Thu</div>
+          <div class="col-md-1"><input class="select" type="checkbox" name="Friday" value="5" id="5">Fri</div>
+          <div class="col-md-1"><input class="select" type="checkbox" name="Saturday" value="6" id="6">Sat</div>
         </div>
+      
         <div class="row">
           <div class="col-md-6">
             <%= f.input :promo_type,input_html: { class: "" },
@@ -133,6 +142,8 @@
   </div>
 <% end %>
 <script>
+
+
 $(document).ready(function(){
   $('#promotion_promo_start_date').datetimepicker({
     timepicker:false,
@@ -150,6 +161,39 @@ $(document).ready(function(){
     datepicker:false,
     format:'H:m'
   });
+
+
+
+
+  var form = document.getElementById("new_promotion");
+  var inputs = form.getElementsByTagName("input");
+  var arr = [];
+  var count = 0;
+  var day = "[";
+ 
+$(".select").click(function() {
+    
+      // debugger;
+      day = "[";
+      for (var j = 8; j <=15; j += 1){
+        if (inputs[j].type === "checkbox" && inputs[j].checked)
+          {
+            if(day == "["){
+              day = day + (inputs[j].value);
+            }
+            else{
+              day = day + "," + (inputs[j].value);
+            }
+          }
+          if(j==15)
+          {
+            day = day + "]";
+          }
+       }
+      document.getElementById("promotion_promo_day").value = '';
+      document.getElementById("promotion_promo_day").value = day;
+  }); 
+     
   $("#promotion_original_product").select2();
   $(".item_code_place").select2();
   $(".item_code_place").on('change', function(event) {

app/views/settings/promotions/index.html.erb

@@ -39,7 +39,13 @@
           <td><%= pro.promo_end_hour.utc.strftime("%I:%M %P") rescue "-" %></td>
           <td><%= pro.promo_day %></td>
           <td>
-            <%= MenuItem.find_by_item_code(pro.original_product).name  rescue "-"%>
+            <% item = MenuItemInstance.find_by_item_instance_code(pro.original_product)%>
+            <% if item.nil? %>
+              <%= Product.find_by_item_code(pro.original_product).name rescue "-" %>
+            <% else %>
+              <%= item.menu_item.name rescue "-" %>
+               - <%= item.item_instance_name rescue "-" %>
+            <% end %>
           </td>
           <% if Employee.exists?(pro.created_by) %>
           <td><%= Employee.find(pro.created_by).name %></td>

app/views/settings/promotions/new.html.erb

@@ -10,7 +10,11 @@
     <%= render 'form', promotion: @promotion %>
 </div>
 <script>
-$("#promotion_promo_code").val(Math.random().toString(36).slice(5) + Math.random().toString(36).slice(5));
+ var r_id = Math.random().toString(36).slice(5);
+ if(r_id.length > 16){
+	r_id = r_id.substring(0, 15);
+	}
+ $("#promotion_promo_code").val(r_id);
 // $( "#fromtime" ).timepicker();
 // $( "#totime" ).timepicker({ 'scrollDefault': 'now' });
 </script>