diff --git a/Gemfile b/Gemfile
index 7b2cdca5..44a85e51 100644
--- a/Gemfile
+++ b/Gemfile
@@ -116,3 +116,4 @@ gem 'httparty', '~> 0.15.5'
 # # gem 'momentjs-rails', '>= 2.9.0'
 # gem 'bootstrap3-datetimepicker-rails'z
 gem 'bootstrap-datepicker-rails'
+gem 'jquery-datetimepicker-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 912f79ef..f2d875dd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -89,6 +89,7 @@ GEM
     jbuilder (2.7.0)
       activesupport (>= 4.2.0)
       multi_json (>= 1.2)
+    jquery-datetimepicker-rails (2.4.1.0)
     jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -265,6 +266,7 @@ DEPENDENCIES
   font-awesome-rails
   httparty (~> 0.15.5)
   jbuilder (~> 2.5)
+  jquery-datetimepicker-rails
   jquery-rails
   jquery-ui-rails
   kaminari (~> 1.0.1)
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index cd056d1c..675bca2e 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -20,6 +20,7 @@
 //= require settings/processing_items
 //= require jquery-ui
 //= require bootstrap-datepicker
+//= require jquery.datetimepicker
 
 $(document).on('turbolinks:load', function() {
   $('.datepicker').datepicker({
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 2db849ab..6ff7113c 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -4,6 +4,7 @@
 @import "theme";
 @import "jquery-ui";
 @import "bootstrap-datepicker3";
+@import "jquery.datetimepicker";
 
 /* Show it is fixed to the top */
 // body {
@@ -75,5 +76,3 @@ select.form-control {
 }
 
 /*--- Reset --- */
-
-
diff --git a/app/controllers/settings/promotions_controller.rb b/app/controllers/settings/promotions_controller.rb
index 246bd51b..94f095ec 100644
--- a/app/controllers/settings/promotions_controller.rb
+++ b/app/controllers/settings/promotions_controller.rb
@@ -28,8 +28,14 @@ class Settings::PromotionsController < ApplicationController
   def create
     @promotion = Promotion.new(promotion_params)
     @promotion.created_by = current_login_employee.id
+    @promotion.promo_start_hour = @promotion.promo_start_hour.to_datetime.advance(hours: +6, minutes: +30)
+    @promotion.promo_end_hour = @promotion.promo_end_hour.to_datetime.advance(hours: +6, minutes: +30)
     respond_to do |format|
       if @promotion.save
+        promo_pros = @promotion.promotion_products
+        promo_pros.each do |promo_pro|
+          promo_pro.save
+        end
         format.html { redirect_to settings_promotions_path, notice: 'Promotion was successfully created.' }
         format.json { render :show, status: :created, location: @promotion }
       else
@@ -44,6 +50,13 @@ class Settings::PromotionsController < ApplicationController
   def update
     respond_to do |format|
       if @promotion.update(promotion_params)
+        @promotion.promo_start_hour = @promotion.promo_start_hour.to_datetime.advance(hours: +6, minutes: +30)
+        @promotion.promo_end_hour = @promotion.promo_end_hour.to_datetime.advance(hours: +6, minutes: +30)
+        @promotion.save
+        promo_pros = @promotion.promotion_products
+        promo_pros.each do |promo_pro|
+          promo_pro.save
+        end
         format.html { redirect_to settings_promotions_path, notice: 'Promotion was successfully updated.' }
         format.json { render :show, status: :ok, location: @promotion }
       else
diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb
index 474dcb3d..c3953f32 100644
--- a/app/views/settings/promotions/_form.html.erb
+++ b/app/views/settings/promotions/_form.html.erb
@@ -1,3 +1,4 @@
+
 <%= simple_nested_form_for([:settings,@promotion]) do |f| %>
   <%= f.error_notification %>
 
@@ -20,11 +21,23 @@
         </div>
         <div class="row">
           <div class="col-md-6">
-            <%= f.input :promo_start_hour %>
+            <!-- <%= f.input :promo_start_hour %> -->
+            <% if !@promotion.promo_start_hour.nil?%>
+              <%= f.input :promo_start_hour, as: :string, input_html: {  :value => @promotion.promo_start_hour.utc.strftime('%H:%M') } %>
+            <% else %>
+              <%= f.input :promo_start_hour, as: :string, input_html: { } %>
+            <% end %>
             <!-- <span>Promo Start Hour</span>
             <%= text_field_tag :promo_start_hour , nil, :placeholder => "From Time", :id => "fromtime", :class => 'form-control' %> -->
           </div>
-          <div class="col-md-6"><%= f.input :promo_end_hour %></div>
+          <div class="col-md-6">
+            <!-- <%= f.input :promo_end_hour %> -->
+            <% if !@promotion.promo_end_hour.nil?%>
+              <%= f.input :promo_end_hour, as: :string, input_html: {:value => @promotion.promo_end_hour.utc.strftime('%H:%M') } %>
+            <% else %>
+              <%= f.input :promo_end_hour, as: :string, input_html: {} %>
+            <% end %>
+          </div>
         </div>
         <div class="row">
           <div class="col-md-12"><%= f.input :promo_day %></div>
@@ -40,19 +53,52 @@
           <div class="col-md-6"><%= f.input :min_qty %></div>
         </div>
         <br>
-        <p><%= f.link_to_add "Add Product", :promotion_products, :class => 'btn btn-primary' %></p>
         <br>
-          <%= f.fields_for :promotion_products do |p| %>
+        <table class="table" style="border : 1px solid #555555 !important;margin:0px">
+          <tbody>
+            <tr>
+                <!-- <td>Promotion Code</td> -->
+                <td>Item Code</td>
+                <td>Min Qty</td>
+                <td>Net off</td>
+                <td>Net Price</td>
+                <td>Percentage</td>
+                <td colspan="2"></td>
+            </tr>
 
-            <div class="row">
-              <div class="col-md-1"><%= p.input :item_code , :class => "form-control" %></div>
-              <div class="col-md-1"><%= p.input :min_qty , :class => "form-control" %></div>
-              <div class="col-md-1"><%= p.input :net_off , :class => "form-control" %></div>
-              <div class="col-md-1"><%= p.input :net_price , :class => "form-control" %></div>
-              <div class="col-md-1"><%= p.input :percentage , :class => "form-control" %></div>
-              <div class="col-md-1" style='padding-top:30px;'><%= p.link_to_remove "X"%></div>
-            </div>
+          <!-- <%  @promotion.promotion_products.each do |pp| %>
+
+                <tr>
+                  <!-- <td><%= pp.promotion_id  %></td>
+                  <td><%= pp.item_code %></td>
+                  <td><%= pp.min_qty %></td>
+                  <td><%= pp.net_off %></td>
+                  <td><%= pp.net_price %></td>
+                  <td><%= pp.percentage %></td>
+                  <td><%= link_to 'Edit', edit_settings_promotion_promotion_product_path(@promotion,pp) %></td>
+                  <td><%= link_to 'Destroy', settings_promotion_promotion_product_path(@promotion,pp), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+                </tr>
+
+          <% end %> -->
+        </tbody>
+      </table>
+          <%= f.fields_for :promotion_products do |pro| %>
+          <table class="table" style="margin:0px">
+            <tbody>
+            <tr>
+              <!-- <td></td> -->
+              <td><%= pro.input :item_code, label: false%></td>
+              <td><%= pro.input :min_qty , label: false%></td>
+              <td><%= pro.input :net_off , label: false %></td>
+              <td><%= pro.input :net_price , label: false %></td>
+              <td><%= pro.input :percentage , label: false %></td>
+              <td><%= pro.link_to_remove "X" %></td>
+              <td></td>
+            </tr>
+          </tbody>
+        </table>
           <% end %>
+          <%= f.link_to_add "Add Product", :promotion_products, :class => 'btn btn-primary' %>
 
     </div>
   </div>
@@ -61,3 +107,23 @@
     <%= f.button :submit %>
   </div>
 <% end %>
+<script>
+$(document).ready(function(){
+  $('#promotion_promo_start_date').datetimepicker({
+    timepicker:false,
+    format:'Y-m-d'
+  });
+  $('#promotion_promo_end_date').datetimepicker({
+    timepicker:false,
+    format:'Y-m-d'
+  });
+  $('#promotion_promo_start_hour').datetimepicker({
+    datepicker:false,
+    format:'H:m'
+  });
+  $('#promotion_promo_end_hour').datetimepicker({
+    datepicker:false,
+    format:'H:m'
+  });
+});
+</script>
diff --git a/app/views/settings/promotions/index.html.erb b/app/views/settings/promotions/index.html.erb
index 606b138b..7914c6af 100644
--- a/app/views/settings/promotions/index.html.erb
+++ b/app/views/settings/promotions/index.html.erb
@@ -35,8 +35,8 @@
           <td><%= link_to pro.promo_code, settings_promotion_path(pro) %></td>
           <td><%= pro.promo_start_date %></td>
           <td><%= pro.promo_end_date %></td>
-          <td><%= pro.promo_start_hour.strftime("%I:%M %P") rescue "-" %></td>
-          <td><%= pro.promo_end_hour.strftime("%I:%M %P") rescue "-" %></td>
+          <td><%= pro.promo_start_hour.utc.strftime("%I:%M %P") rescue "-" %></td>
+          <td><%= pro.promo_end_hour.utc.strftime("%I:%M %P") rescue "-" %></td>
           <td><%= pro.promo_day %></td>
           <td>
             <% if MenuItem.exists?(pro.original_product) %>
diff --git a/app/views/settings/promotions/show.html.erb b/app/views/settings/promotions/show.html.erb
index 170ba4bf..4a994919 100644
--- a/app/views/settings/promotions/show.html.erb
+++ b/app/views/settings/promotions/show.html.erb
@@ -17,8 +17,8 @@
           <tr><td style="width:20%">Promotion code</td><td><%= @promotion.promo_code  %></td></tr>
           <tr><td style="width:20%">Promotion Start Date</td><td><%= @promotion.promo_start_date %></td></tr>
           <tr><td style="width:20%">Promotion End Date</td><td><%= @promotion.promo_end_date %></td></tr>
-          <tr><td style="width:20%">Promotion Start Hour</td><td><%= @promotion.promo_start_hour %></td></tr>
-          <tr><td style="width:20%">Promotion Start Hour</td><td><%= @promotion.promo_end_hour %></td></tr>
+          <tr><td style="width:20%">Promotion Start Hour</td><td><%= @promotion.promo_start_hour.utc.strftime("%I:%M %P") rescue "-"  %></td></tr>
+          <tr><td style="width:20%">Promotion Start Hour</td><td><%= @promotion.promo_end_hour.utc.strftime("%I:%M %P") rescue "-"  %></td></tr>
           <tr><td style="width:20%"><%= link_to 'Edit', edit_settings_promotion_path(@promotion) %></td><td><%= link_to 'Destroy', settings_promotion_path(@promotion), method: :delete, data: { confirm: 'Are you sure?' } %></td></tr>