Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui

2017-12-11 10:40:22 +06:30
parent 0dce6e4329 01ead63d19
commit a48ace07da
16 changed files with 231 additions and 110 deletions
--- a/app/models/dining_facility.rb
+++ b/app/models/dining_facility.rb
@@ -78,13 +78,13 @@ class DiningFacility < ApplicationRecord
  def get_checkout_booking
    booking = self.get_current_checkout_booking
    if booking
-      now = Time.now.utc
+      now = Time.now.utc.getlocal
      hr = (now.strftime("%H").to_i).to_int
      min = (now.strftime("%M").to_i).to_int
      if !booking.checkout_at.nil?
-        checkout_at = booking.checkout_at.utc
-        checkout_at_hr = (checkout_at.utc.strftime("%H").to_i).to_int
-        checkout_at_min = (checkout_at.utc.strftime("%M").to_i).to_int
+        checkout_at = booking.checkout_at.utc.getlocal
+        checkout_at_hr = (checkout_at.strftime("%H").to_i).to_int
+        checkout_at_min = (checkout_at.strftime("%M").to_i).to_int
        checkout_at_min -= min
        if (checkout_at_hr <= hr) && (checkout_at_min <= 15)
          return booking
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -132,7 +132,11 @@
                  <div id="save_order_id" data-order="">
                  <% end %>
                    <strong id="order-title">ORDER DETAILS </strong> | Table <%= @dining.name rescue "" %>
-                    <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+                    <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? && %>
+                      <span class="float-right"><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %></span>
+                    <% else %>
+                      <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+                    <% end %>
                  </div>
              <% elsif @status_sale == 'sale' %>
                  <div><strong id="order-title">INVOICE DETAILS </strong> | Table <%= @dining.name rescue "" %>
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -132,12 +132,20 @@
       <div class="card-header">
         <% if @status_order == 'order' %>
            <div id="save_order_id" data-order="<%= @obj_order.order_id %>"><strong id="order-title">ORDER DETAILS </strong> |  Table <%= @room.name rescue "" %>
-            <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+            <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? && %>
+              <span class="float-right"><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %></span>
+            <% else %>
+              <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+            <% end %>
            </div>

         <% elsif @status_sale == 'sale' %>
            <div><strong id="order-title">INVOICE DETAILS </strong> |  Table <%= @room.name rescue "" %>
-            <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+            <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? && %>
+              <span class="float-right"><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %></span>
+            <% else %>
+              <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+            <% end %>
            </div>

         <% end %>
--- a/app/views/reports/dailysale/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/dailysale/_shift_sale_report_filter.html.erb
@@ -24,11 +24,11 @@
 			<div class="col-lg-3 col-md-3 col-sm-3">					
 				<!-- <label class="">Select Shift Period</label> -->
 				<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
-				<input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" placeholder="From date" style="height: 37px;">
+				<input data-behaviour='datepicker' class="form-control datepicker" name="from" id="from" type="text" placeholder="From date" style="height: 35px;">
 			</div>
 			<div class="col-lg-3 col-md-3 col-sm-3">
 				<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
-				<input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" placeholder="To date" style="height: 37px;">
+				<input data-behaviour='datepicker' class="form-control datepicker" name="to" id="to" type="text" placeholder="To date" style="height: 35px;">
 			</div>
 			<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
 			    <label></label><br>
--- a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
@@ -27,15 +27,15 @@
 		<div class="col-lg-2 col-md-2 col-sm-2">					
 			<!-- <label class="">Select Shift Period</label> -->
 			<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
-			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 33.5px;">
+			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 32px;">
 		</div>
 		<div class="col-lg-2 col-md-2 col-sm-2">
 			<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
-			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 33.5;">
+			<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 32px;">
 		</div>
 		<div class="col-lg-2 col-md-2 col-sm-2">
 			<label class="font-14"><%= t("views.right_panel.detail.all_shift") %></label>
-			<select class="form-control select" name="shift_name" id="shift_name" style="height: 36px;" >
+			<select class="form-control select" name="shift_name" id="shift_name" >
 			</select>
 		</div>
 		<div class="col-lg-1 col-md-1 col-sm-1 margin-top-20">
--- a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
@@ -22,11 +22,11 @@
 		<div class="col-lg-3 col-md-3 col-sm-3">					
 			<!-- <label class="">Select Shift Period</label> -->
 			<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
-			<input data-behaviour='datepicker' class="form-control m-t-3 datepicker" name="from" id="from" type="text" placeholder="From date">
+			<input data-behaviour='datepicker' class="form-control m-t-3 datepicker" name="from" id="from" type="text" placeholder="From date" style="height: 32px;">
 		</div>
 		<div class="col-lg-3 col-md-3 col-sm-3">
 			<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
-			<input data-behaviour='datepicker' class="form-control m-t-3 datepicker" name="to" id="to" type="text" placeholder="To date">
+			<input data-behaviour='datepicker' class="form-control m-t-3 datepicker" name="to" id="to" type="text" placeholder="To date" style="height: 32px;">
 		</div>
 		<div class="col-lg-2 col-md-2 col-sm-2">
 			<label class="font-14">All Shift</label>
--- a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
@@ -22,15 +22,15 @@
 				<div class="col-lg-3 col-md-3 col-sm-3">					
 					<!-- <label class="font-14">Select Shift Period</label> -->
 					<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
-					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 34px;">
+					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 32px;">
 				</div>
 				<div class="col-lg-3 col-md-3 col-sm-3">
 					<label class="font-14"><%= t("views.right_panel.detail.to") %></label>
-					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 34px;">
+					<input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 32px;">
 				</div>
 				<div class="col-lg-2 col-md-2 col-sm-2">
 					<label class="font-14"><%= t("views.right_panel.detail.all_shift") %></label>
-					<select class="form-control select" name="shift_name" id="shift_name" style="height: 37px;" >
+					<select class="form-control select" name="shift_name" id="shift_name" >
 					</select>
 				</div>
 				<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20"><br>
--- a/app/views/reports/stock_check/_stock_check_report_filter.html.erb
+++ b/app/views/reports/stock_check/_stock_check_report_filter.html.erb
@@ -14,11 +14,11 @@
            <div class="col-lg-3 col-md-3 col-sm-3">          
                <!-- <label class="">Select Shift Period</label> -->
                <label class="font-14">From</label>
-                <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 35px;">
+                <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="from" id="from" type="text" placeholder="From date" style="height: 32px;">
            </div>
            <div class="col-lg-3 col-md-3 col-sm-3">
                <label class="font-14">To</label>
-                <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 35px;">
+                <input data-behaviour='datepicker' class="form-control datepicker m-t-3" name="to" id="to" type="text" placeholder="To date" style="height: 32px;">
            </div>
            <div class="form-group col-md-4">
                <label class="font-14">Definition Item</label>
--- a/app/views/settings/membership_actions/_form.html.erb
+++ b/app/views/settings/membership_actions/_form.html.erb
@@ -22,10 +22,25 @@
  <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.membership_type") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.membership_type_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+        2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
+        3) <%= t("views.right_panel.detail.gateway_communication_type") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.gateway_communication_type_txt") %> <br>
+        4) <%= t("views.right_panel.detail.gateway_url") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.gateway_url_txt") %> <br>
+        5) <%= t("views.right_panel.detail.auth_token") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.auth_token_txt") %> <br>
+        6) <%= t("views.right_panel.detail.merchant_account") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.merchant_account_txt") %> <br>
+        7) <%= t("views.right_panel.detail.created_by") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.created_by_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.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.membership_actions_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.membership_actions_txt") %> <br>
+        </p>
      </div>
    </div>  
  </div>
--- a/app/views/settings/membership_actions/edit.html.erb
+++ b/app/views/settings/membership_actions/edit.html.erb
@@ -1,9 +1,9 @@

 <div class="page-header">
  <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-    <li class="breadcrumb-item"><a href="<%= settings_membership_actions_path %>">Membership Actions</a></li>
-    <li class="breadcrumb-item active">Edit</li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_membership_actions_path %>"><%= t("views.right_panel.detail.setting_membership_actions") %></a></li>
+    <li class="breadcrumb-item active"><%= t("views.btn.edit") %></li>
    <span class="float-right">
      <%= link_to t('.back', :default => t("views.btn.back")), settings_membership_actions_path %>
    </span>
--- a/app/views/settings/membership_actions/index.html.erb
+++ b/app/views/settings/membership_actions/index.html.erb
@@ -1,7 +1,7 @@
 <div class="page-header">
  <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-    <li class="breadcrumb-item active">Settings Membership Actions</li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item active"><%= t("views.right_panel.detail.setting_membership_actions") %></li>
    <span class="float-right">
      <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
    </span>
@@ -20,11 +20,11 @@
          <table class="table">
            <thead>
              <tr>
-                <th>Membership type</th>
+                <th><%= t("views.right_panel.detail.membership_type") %></th>
            <!--     <th>Gateway url</th> -->
-                <th>Merchant account</th>
+                <th><%= t("views.right_panel.detail.merchant_account") %></th>

-                <th>Actions</th>
+                <th><%= t("views.right_panel.detail.actions") %></th>
              </tr>
            </thead>

@@ -48,10 +48,25 @@
  <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.membership_type") %> - <%= t("views.right_panel.detail.membership_type_txt") %> <br>
+        2) <%= t("views.right_panel.detail.merchant_account") %> - <%= t("views.right_panel.detail.merchant_account_txt") %> <br>
+        3) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt") %> <%= t("views.right_panel.detail.membership_actions_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.membership_actions_txt") %> <br>
+        2) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.membership_actions_txt") %> <br>
+        3) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.membership_actions_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/membership_actions/new.html.erb
+++ b/app/views/settings/membership_actions/new.html.erb
@@ -1,9 +1,9 @@

 <div class="page-header">
  <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-    <li class="breadcrumb-item"><a href="<%= settings_membership_actions_path %>">Membership Actions</a></li>
-    <li class="breadcrumb-item active">New</li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_membership_actions_path %>"><%= t("views.right_panel.detail.setting_membership_actions") %></a></li>
+    <li class="breadcrumb-item active"><%= t("views.btn.new") %></li>
    <span class="float-right">
      <%= link_to t('.back', :default => t("views.btn.back")), settings_membership_actions_path %>
    </span>
--- a/app/views/settings/membership_actions/show.html.erb
+++ b/app/views/settings/membership_actions/show.html.erb
@@ -1,69 +1,101 @@

 <div class="page-header">
  <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-    <li class="breadcrumb-item"><a href="<%= settings_membership_actions_path %>">Membership Actions</a></li>
-    <li class="breadcrumb-item active">Details</li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_membership_actions_path %>"><%= t("views.right_panel.detail.setting_membership_actions") %></a></li>
+    <li class="breadcrumb-item active"><%= t :details %></li>
    <span class="float-right">
      <%= link_to t('.back', :default => t("views.btn.back")), settings_membership_actions_path %>
    </span>
  </ol>
 </div>
-<div class="card">
-  <div class="card-block">
-    <table class="table">
-      <tbody>
-        <tr>
-          <th>Membership type</th>
-          <td><%= @settings_membership_action.membership_type %></td>
-        </tr>
-        <tr>
-          <th>Is active</th>
-          <td><%= @settings_membership_action.is_active %></td>
-        </tr>
-        <tr>
-          <th>Gateway communication type</th>
-          <td><%= @settings_membership_action.gateway_communication_type %></td>
-        </tr>
-        <tr>
-          <th>Gateway url</th>
-          <td><%= @settings_membership_action.gateway_url %></td>
-        </tr>
-        <tr>
-          <th>Auth token</th>
-          <td><%= @settings_membership_action.auth_token %></td>
-        </tr>
-        <tr>
-          <th>Merchant account</th>
-          <td><%= @settings_membership_action.merchant_account_id %></td>
-        </tr>
-        <tr>
-          <th>Created by</th>
-          <td><%= @settings_membership_action.created_by %></td>
-        </tr>
-        <tr>
-          <th>Additional parameter</th>
-          <td><%= @settings_membership_action.additional_parameter %></td>
-        </tr>
-        <tr>
-        <td></td>
-          <td colspan="" align="">
-            <%= link_to t("views.btn.edit"), edit_settings_membership_action_path(@settings_membership_action),:class => 'btn btn-primary btn-sm waves-effect' %>
-            <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_membership_action_path(@settings_membership_action)%>" data-method="delete" disabled>
-                <%= 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>
-        </tr>
-      </tbody>
-    </table>
+<div class="row">
+  <div class="col-xs-12 col-sm-12 col-md-8 col-lg-8">
+    <div class="card">
+      <div class="card-block">
+        <table class="table">
+          <tbody>
+            <tr>
+              <th><%= t("views.right_panel.detail.membership_type") %></th>
+              <td><%= @settings_membership_action.membership_type %></td>
+            </tr>
+            <tr>
+              <th><%= t("views.right_panel.detail.is_active") %></th>
+              <td><%= @settings_membership_action.is_active %></td>
+            </tr>
+            <tr>
+              <th><%= t("views.right_panel.detail.gateway_communication_type") %></th>
+              <td><%= @settings_membership_action.gateway_communication_type %></td>
+            </tr>
+            <tr>
+              <th><%= t("views.right_panel.detail.gateway_url") %></th>
+              <td><%= @settings_membership_action.gateway_url %></td>
+            </tr>
+            <tr>
+              <th><%= t("views.right_panel.detail.auth_token") %></th>
+              <td><%= @settings_membership_action.auth_token %></td>
+            </tr>
+            <tr>
+              <th><%= t("views.right_panel.detail.merchant_account") %></th>
+              <td><%= @settings_membership_action.merchant_account_id %></td>
+            </tr>
+            <tr>
+              <th><%= t("views.right_panel.detail.created_by") %></th>
+              <td><%= @settings_membership_action.created_by %></td>
+            </tr>
+            <tr>
+              <th><%= t("views.right_panel.detail.additional_parameter") %></th>
+              <td><%= @settings_membership_action.additional_parameter %></td>
+            </tr>
+            <tr>
+            <td></td>
+              <td colspan="" align="">
+                <%= link_to t("views.btn.edit"), edit_settings_membership_action_path(@settings_membership_action),:class => 'btn btn-primary btn-sm waves-effect' %>
+                <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_membership_action_path(@settings_membership_action)%>" data-method="delete" disabled>
+                    <%= 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>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+  <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4">
+    <div class="card">
+      <div class="body">
+        <h5><%= t("views.right_panel.header.membership_actions") %></h5>
+        <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.membership_type") %> - <%= t("views.right_panel.detail.membership_type_txt") %> <br>
+          2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.membership_type_txt") %> <%= t("views.right_panel.detail.is_active_txt") %> <br>
+          3) <%= t("views.right_panel.detail.gateway_communication_type") %> - <%= t("views.right_panel.detail.gateway_communication_type_txt") %><br>
+          4) <%= t("views.right_panel.detail.gateway_url") %> - <%= t("views.right_panel.detail.gateway_url_txt") %><br>
+          5) <%= t("views.right_panel.detail.auth_token") %> - <%= t("views.right_panel.detail.auth_token_txt") %><br>
+          6) <%= t("views.right_panel.detail.merchant_account") %> - <%= t("views.right_panel.detail.merchant_account_txt") %><br>
+          7) <%= t("views.right_panel.detail.created_by") %> - <%= t("views.right_panel.detail.created_by_txt") %> <%= t("views.right_panel.detail.membership_actions_txt") %> <br>
+          8) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.membership_actions_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.membership_actions_txt") %> <br>
+        2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.membership_actions_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>
 </div>
-
 </div>


--- a/app/views/settings/membership_settings/_form.html.erb
+++ b/app/views/settings/membership_settings/_form.html.erb
@@ -24,10 +24,27 @@
  <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.membership_type") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.membership_type_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+        2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.checkbox") %>  <%= t("views.right_panel.detail.is_active_txt") %> <br>
+        3) <%= t("views.right_panel.detail.gateway_communication_type") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.gateway_communication_type_txt") %> <br>
+        4) <%= t("views.right_panel.detail.gateway_url") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.gateway_url_txt") %> <br>
+        5) <%= t("views.right_panel.detail.auth_token") %> - <%= t("views.right_panel.detail.write_txt") %> <%= t("views.right_panel.detail.auth_token_txt") %> <br>
+        6) <%= t("views.right_panel.detail.discount") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.discount_txt") %> <br>
+        7) <%= t("views.right_panel.detail.rebate") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.rebate_txt") %> <br>
+        8) <%= t("views.right_panel.detail.bonus") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.bonus_txt") %> <br>
+        9) <%= t("views.right_panel.detail.point") %> - <%= t("views.right_panel.detail.checkbox") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.point_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.submit") %> - <%= t("views.right_panel.detail.submit_btn_txt") %> <%= t("views.right_panel.detail.membership_setting_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.membership_setting_txt") %> <br>
+        </p>
      </div>
    </div>  
  </div>
--- a/app/views/settings/membership_settings/index.html.erb
+++ b/app/views/settings/membership_settings/index.html.erb
@@ -1,8 +1,8 @@

 <div class="page-header">
  <ol class="breadcrumb">
-    <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-     <li class="breadcrumb-item">Membership Setting</li>
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+     <li class="breadcrumb-item"><%= t("views.right_panel.detail.membership_setting") %></li>
    <span class="float-right">
      <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
    </span>
@@ -17,16 +17,16 @@
      <table class="table table-striped">
        <thead>
          <tr>
-            <th>Membership type</th>
-            <th>Is active</th>
-            <th>Gateway communication type</th>
+            <th><%= t("views.right_panel.detail.membership_type") %></th>
+            <th><%= t("views.right_panel.detail.is_active") %></th>
+            <th><%= t("views.right_panel.detail.gateway_communication_type") %></th>
            <!-- <th>Gateway url</th> -->
        <!-- <th>Auth token</th>
        <th>Merchant account</th> -->
-        <th>Discount</th>
-        <th>Rebate</th>
-        <th>Bonus</th>
-        <th>Points</th>
+        <th><%= t("views.right_panel.detail.discount") %></th>
+        <th><%= t("views.right_panel.detail.rebate") %></th>
+        <th><%= t("views.right_panel.detail.bonus") %></th>
+        <th><%= t("views.right_panel.detail.point") %></th>
        <th ></th>
      </tr>
    </thead>
@@ -55,10 +55,27 @@
 <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.membership_type") %> - <%= t("views.right_panel.detail.membership_type_txt") %> <%= t("views.right_panel.detail.name_txt") %> <br>
+        2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.is_active_txt") %> <br>
+        3) <%= t("views.right_panel.detail.gateway_communication_type") %> - <%= t("views.right_panel.detail.gateway_communication_type_txt") %> <br>
+        4) <%= t("views.right_panel.detail.discount") %> - <%= t("views.right_panel.detail.discount_txt") %> <br>
+        5) <%= t("views.right_panel.detail.rebate") %> - <%= t("views.right_panel.detail.rebate_txt") %> <br>
+        6) <%= t("views.right_panel.detail.bonus") %> - <%= t("views.right_panel.detail.bonus_txt") %> <br>
+        7) <%= t("views.right_panel.detail.point") %> - <%= t("views.right_panel.detail.point_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.membership_setting_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/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -156,6 +156,9 @@ en:
        cashier_terminal: "Cashier Terminal"
        print_settings: "Print Settings"
        transaction_sales: "Transactions Sales"
+        setting_membership_actions: "Setting Membership Actions"
+        membership_actions: "Membership Actions"
+        membership_setting: "Membership Setting"
      button:
        new: "NEW"
        create: "CREATE"
@@ -438,6 +441,9 @@ en:
        dine_in: "Dine in"
        takeaway: "Takeaway"
        membership: "Membership"
+        gateway_communication_type: "Gateway communication type"
+        gateway_url: "Gateway url"
+        additional_parameter: "Additional parameter"
        
        code_txt: "code "
        charge_txt: "charge"
@@ -597,6 +603,13 @@ en:
        no_data_txt: "There is no data for search"
        assign_txt: "to assign "
        remove_txt: "to remove "
+        membership_type_txt: "membership type"
+        merchant_account_txt: "merchant account"
+        membership_actions_txt: "membership actions"
+        gateway_communication_type_txt: "gateway communication type"
+        gateway_url_txt: "gateway url"
+        membership_setting_txt: "membership setting"
+
        cancel_btn_txt: "to cancel "
        image_btn_txt: "to upload "
        create_btn_txt: "to create "