diff --git a/app/assets/javascripts/login.js b/app/assets/javascripts/login.js
index db75a715..18d50be5 100755
--- a/app/assets/javascripts/login.js
+++ b/app/assets/javascripts/login.js
@@ -17,4 +17,5 @@
 //= require bootstrap/js/bootstrap-material-design.min
 //= require turbolinks
 //= require node-waves/waves.js
-//= require BSBMaterial/admin.js
\ No newline at end of file
+//= require BSBMaterial/admin.js
+//= require bootstrap-notify/bootstrap-notify.js
\ No newline at end of file
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 70824f58..a032998a 100755
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -32,4 +32,33 @@
   line-height: inherit;
   padding:5px;
 }
-/*----- Order Processing Items -----*/
\ No newline at end of file
+/*----- Order Processing Items -----*/
+
+
+/* ==========  Select Field ========== */
+
+/* Remove focus */
+select:focus {
+  outline: none}
+
+/* Hide label */
+.custom-selectfield label {display: none;}
+/* Use custom arrow */
+.custom-selectfield select {appearance: none}
+.custom-selectfield {
+  position: relative;
+    &:after {
+        position: absolute;
+        top: 1em;
+        right: 0.5em;
+        /* Styling the down arrow */
+        width: 0;
+        height: 0;
+        padding: 0;
+        content: '';
+        border-left: .25em solid transparent;
+        border-right: .25em solid transparent;
+        border-top: .375em solid #111;
+        pointer-events: none;
+    }
+}
\ No newline at end of file
diff --git a/app/views/inventory/inventory_definitions/_form.html.erb b/app/views/inventory/inventory_definitions/_form.html.erb
index 07db604b..cb310a29 100755
--- a/app/views/inventory/inventory_definitions/_form.html.erb
+++ b/app/views/inventory/inventory_definitions/_form.html.erb
@@ -10,8 +10,9 @@
         <% Product.order("name desc").pluck(:name, :item_code).each do |p| %>
             <% arr.push(p) %>
         <% end %>
-        <div class="col-md-4">
-          <label class="control-label"><abbr title="required">*</abbr>Select Item</label>
+        <div class="col-md-4 ">
+          <div class="form-group">
+            <label class="control-label"><abbr title="required">*</abbr>Select Item</label>
           <select class="form-control item_code_place" id="item">
             <% if !@inventory_definition.item_code.nil? %>
                 <% menuiteminstance = MenuItemInstance.find_by_item_instance_code(@inventory_definition.item_code) %>
@@ -21,7 +22,7 @@
                     <% code = menuiteminstance.menu_item.item_code %>
                 <% end %>
             <% end %>
-            <option value="">Select Item</option>
+            <option value=""></option>
             <% arr.each do |a| %>
                 <% if a[1] == code %>
                     <option value="<%= a[1] %>" selected><%= a[0] %></option>
@@ -30,6 +31,7 @@
                 <% end %>
             <% end %>
           </select>
+          </div>
         </div>
 
         <% sample = [] %>
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index 37cf7b1f..d2a8f747 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -52,7 +52,7 @@
                 color = "bg-black"
             end %>
             
-            <p id="noti" class="hidden" data-placement-from="top" data-message="<%=message%>" data-placement-align="center"
+            <p id="noti" class="hidden noti" data-placement-from="top" data-message="<%=message%>" data-placement-align="center"
                 data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
             </p>
    <% end %>  
@@ -160,7 +160,7 @@
     $(document).on('turbolinks:load', function () {
 
          // for Notificaiotn message
-
+console.log("hi");
          var placementFrom  = $("#noti").attr('data-placement-from');
          var placementAlign = $("#noti").attr('data-placement-align');
          var animateEnter   = $("#noti").attr('data-animate-enter');
diff --git a/app/views/settings/commissioners/_form.html.erb b/app/views/settings/commissioners/_form.html.erb
index c123e434..dc7e1f69 100755
--- a/app/views/settings/commissioners/_form.html.erb
+++ b/app/views/settings/commissioners/_form.html.erb
@@ -8,10 +8,14 @@
           <div class="form-inputs">
             <%= f.input :name %>
             <%= f.label :emp_id, 'Employee' %>
-            <%= f.collection_select :emp_id, Employee.all.order('name asc'), :id, :name, {prompt: 'Select an Employee'}, {class: "form-control"} %>
+            
+              <%= f.collection_select :emp_id, Employee.all.order('name asc'), :id, :name, {prompt: 'Select an Employee'}, {class: "form-control"} %>
+            
             <br/>
-            <%= f.label :commission_id, 'Commission' %><br/>
-            <%= f.select :commission_id, Commission.all.map {|l| [l.menu_item.name, l.id]}, {prompt: 'Select a Product'}, {class: 'form-control'} %>
+            
+            <%= f.label :commission_id, 'Commission'%>
+            <%= f.select :commission_id, Commission.all.map {|l| [l.menu_item.name, l.id]}, { :include_blank => 'Choose Commission Product', :selected => ''}, {class: 'form-control'} %>
+            
             <br/>
             <%= f.label :joined_date %><br/>
             <%= f.text_field :joined_date, {class: 'form-control datepicker', id: 'joined_date', readonly: true} %><br/>
@@ -53,7 +57,9 @@
 </div>
 
 <script type="text/javascript">
-  $(document).on('turbolinks:load', function() {
+$(document).on('page:load', function() {
+
+  // $(document).on('turbolinks:load', function() {
   $('body').bootstrapMaterialDesign();
 });
 </script>
diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb
index 914c3324..0b333ede 100755
--- a/app/views/settings/promotions/_form.html.erb
+++ b/app/views/settings/promotions/_form.html.erb
@@ -95,18 +95,18 @@
           <div class="col-md-1"><label><input class="selectDay" type="checkbox" name="Saturday" value="6" id="6"> Sat</label></div>
         </div>
 
-        <div class="row">
+       <!--  <div class="row">
           <div class="col-md-5 form-group">
             <select name="promotion[promo_type]" class="form-control">
-                <option>Quantity</option>
+                <option>Choose Promotion Type</option>
                 <option>Net_off</option>
                 <option>Net_price</option>
                 <option>Percentage</option>
-            </select>
-          <!--   <%= f.input :promo_type, collection: %w{Quantity Net_off Net_price Percentage},:class => 'form-control' ,:label => "Promotion Type" %> -->
-          </div>
+            </select> -->
+             <%= f.input :promo_type, collection: %w{Quantity Net_off Net_price Percentage},:input_html=>{:class => 'col-md-5 form-control select'} ,:label => "Promotion Type", :include_blank => 'Choose Promotion Type', :selected => '' %> 
+         <!--  </div>
         </div>
-
+ -->
         <div class="row">
           <% arr =  MenuItem.active.order("name desc").pluck(:name,:item_code) %>
           <% Product.order("name desc").pluck(:name,:item_code).each do |p| %>
diff --git a/app/views/settings/tables/show.html.erb b/app/views/settings/tables/show.html.erb
index 00edd68d..f3cc176e 100755
--- a/app/views/settings/tables/show.html.erb
+++ b/app/views/settings/tables/show.html.erb
@@ -59,6 +59,27 @@
               </tr>
           </tbody>
         </table>
+        <%  @table.dining_charges.each do |dc| %>
+          <div class="card">
+          <h4 class="card-title">Dining Charge</h4>
+            <div class="">
+              <table class="table">
+                
+                <tr>
+                  <td class="align-right">Item code :</td>
+                  <td class="align-left"><%= dc.item_code %></td>
+                  <td class="align-right">Unit price : </td>
+                  <td class="align-left"><%= dc.unit_price %></td>
+                  <td class="align-right">Charge type : </td>
+                  <td class="align-left"><%= dc.charge_type %></td>
+                   <td><%= link_to 'Edit Charges', edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc),:class => 'btn bg-deep-purple' %>
+                    <!-- <button class="btn btn-primary" src="<%= edit_settings_zone_table_dining_charge_path(@zone,@settings_table,dc) %>">Edit Charge</button> --></td>
+                </tr>
+                
+                </table>
+              </div>
+          </div>
+          <% end %>
       </div>
     </div>
   </div>