update conflic from adminbsb_uidesign branch

2017-10-26 17:52:21 +06:30
parent 2e6478ebed 526649e6df
commit 89d2bc7b39
47 changed files with 1386 additions and 467 deletions
--- a/app/views/settings/promotions/_form.html.erb
+++ b/app/views/settings/promotions/_form.html.erb
@@ -208,10 +208,37 @@
 <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
    <div class="card">
      <div class="body">
-          Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-         tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-         quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-         consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.promotion_code") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.promotion_code_txt") %> <br>
+        2) <%= t("views.right_panel.detail.start_date") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.start_date_txt") %> <br>
+        3) <%= t("views.right_panel.detail.end_date") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.end_date_txt") %> <br>
+        4) <%= t("views.right_panel.detail.start_time") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.start_time_txt") %> <br>
+        5) <%= t("views.right_panel.detail.end_time") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.end_time_txt") %> <br>
+        6) <%= t("views.right_panel.detail.promotion_day") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.promotion_day_txt") %> <br>
+        7) <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.type_txt") %> <br>
+        8) <%= t("views.right_panel.detail.item") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.item_txt") %> <br>
+        9) <%= t("views.right_panel.detail.original_product") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.original_product_txt") %> <br>
+        10) <%= t("views.right_panel.detail.min_qty") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.min_qty_txt") %>
+        --------------------------------------------------------------------------------
+        <h5>ADD PRODUCT</h5>
+        1) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.select_txt") %> <%= t("views.right_panel.detail.item_code_txt") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+        2) <%= t("views.right_panel.detail.min_qty") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.min_qty_txt") %> <br>
+        3) <%= t("views.right_panel.detail.net_off") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.net_off_txt") %> <br>
+        4) <%= t("views.right_panel.detail.net_price") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.net_price_txt") %> <br>
+        5) <%= t("views.right_panel.detail.percentage") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.percentage_txt") %> <br>
+        6) " X " - <%= t("views.right_panel.detail.remove_txt") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.add_product") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.product_txt") %> <br>
+        2) <%= t("views.right_panel.button.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        </p>
      </div>
    </div>  
  </div>
--- a/app/views/settings/promotions/index.html.erb
+++ b/app/views/settings/promotions/index.html.erb
@@ -27,7 +27,7 @@
            <th>Original Product</th>
            <th>Created By</th>
            <th>Created At</th>
-            <th colspan=""></th>
+            <th colspan="2">Actions</th>
          </tr>
        </thead>

@@ -55,15 +55,7 @@
            <td><%= pro.created_by %></td>
            <% end %>
            <td><%= pro.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
-            <td><%= link_to t("views.btn.edit"), edit_settings_promotion_path(pro) %>
-              <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_promotion_path(pro)%>" data-method="delete">
-                <%= t("views.btn.delete") %>
-              </button>
-
-              <span class="hidden" id="delete_text">
-                <h6>Are you sure you want to delete this row ?</h6>
-                <h6>This action can't be undo. </h6> 
-              </span>
+            <td><%= link_to t("views.btn.edit"), edit_settings_promotion_path(pro),:class => 'btn btn-info btn-sm waves-effect' %>
            </td>
          </tr>
          <% end %>
@@ -74,10 +66,29 @@
  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
    <div class="card">
      <div class="body">
-        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+        1) <%= t("views.right_panel.detail.promotion_code") %> - <%= t("views.right_panel.detail.promotion_code_txt") %> <%= t("views.right_panel.detail.promotion_txt2") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        2) <%= t("views.right_panel.detail.start_date") %> - <%= t("views.right_panel.detail.start_date_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        3) <%= t("views.right_panel.detail.end_date") %> - <%= t("views.right_panel.detail.end_date_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        4) <%= t("views.right_panel.detail.start_time") %> - <%= t("views.right_panel.detail.start_time_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        5) <%= t("views.right_panel.detail.end_time") %> - <%= t("views.right_panel.detail.end_time_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        6) <%= t("views.right_panel.detail.promotion_day") %> - <%= t("views.right_panel.detail.promotion_day_txt") %> <br>
+        7) <%= t("views.right_panel.detail.original_product") %> - <%= t("views.right_panel.detail.original_product_txt") %> <br>
+        8) <%= t("views.right_panel.detail.created_by") %> - <%= t("views.right_panel.detail.created_by_txt") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        9) <%= t("views.right_panel.detail.created_at") %> - <%= t("views.right_panel.detail.created_at_txt") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        10) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt3") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+        1) <%= t("views.right_panel.button.new") %> - <%= t("views.right_panel.detail.new_btn_txt") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        2) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.dashboard_txt") %> <br>
+        </p>
      </div>
    </div>  
  </div>
--- a/app/views/settings/promotions/show.html.erb
+++ b/app/views/settings/promotions/show.html.erb
@@ -14,29 +14,52 @@
    <div class="card-block">
      <h4 class="card-title">Promotion</h4>
      <table class="table">
-
        <tbody>
-
          <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.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 t("views.btn.edit"), edit_settings_promotion_path(@promotion) %></td><td><%= link_to t("views.btn.delete"), settings_promotion_path(@promotion), method: :delete, data: { confirm: 'Are you sure?' } %></td></tr>
-
-
+          <tr><td style="width:20%">Promotion Start Hour</td><td><%= @promotion.promo_end_hour.utc.strftime("%I:%M %P") rescue "-"  %></td></tr>  
        </tbody>
      </table>
+
+      <div class="row">
+        <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8" align="right">
+          <%= link_to t("views.btn.edit"), edit_settings_promotion_path(@promotion),:class => 'btn btn-info btn-sm waves-effect' %>
+          <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_promotion_path(@promotion)%>" data-method="delete">
+              <%= t("views.btn.delete") %>
+          </button>
+
+          <span class="hidden" id="delete_text">
+            <h6>Are you sure you want to delete this row ?</h6>
+            <h6>This action can't be undo. </h6> 
+          </span>
+        </div>
+      </div>
    </div>
  </div>
 </div>
 <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
  <div class="card">
    <div class="body">
-      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+      <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+      <p>
+      1) <%= t("views.right_panel.detail.promotion_code") %> - <%= t("views.right_panel.detail.promotion_code_txt") %> <%= t("views.right_panel.detail.promotion_txt2") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+      2) <%= t("views.right_panel.detail.start_date") %> - <%= t("views.right_panel.detail.start_date_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+      3) <%= t("views.right_panel.detail.end_date") %> - <%= t("views.right_panel.detail.end_date_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+      4) <%= t("views.right_panel.detail.start_time") %> - <%= t("views.right_panel.detail.start_time_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+      5) <%= t("views.right_panel.detail.end_time") %> - <%= t("views.right_panel.detail.end_time_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+      </p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+      <p>
+      1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+      2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+      </p>
+      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+      <p>
+        1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+        2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.promotion_txt") %> <br>
+      </p>
    </div>
  </div>  
 </div>