Merge branch 'r-1902001-01' into foodcourt

This commit is contained in:
Thein Lin Kyaw
2020-09-10 10:31:07 +06:30
184 changed files with 2672 additions and 1021 deletions

View File

@@ -1,4 +1,13 @@
<% breadcrumb_add t('payment_methods'), "", dashboard_path %>
<div class="page-header">
<ol class="breadcrumb">
<li class="breadcrumb-item"><a href="<%= root_path %>"><%= t("views.right_panel.button.home") %></a></li>
<li class="breadcrumb-item active"><%= t("en.payment_methods") %></li>
<span class="float-right">
<%= link_to t('.back', :default => t("views.btn.back")), root_path %>
</span>
</ol>
</div>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
@@ -13,7 +22,7 @@
<th><%= t("views.right_panel.detail.payment_method") %></th>
<th><%= t("views.right_panel.detail.is_active") %></th>
<th><%= t("views.right_panel.detail.gateway") %> <%= t("views.right_panel.detail.comm_type") %></th>
<th><%= t("views.right_panel.detail.gateway") %> <%= t("views.right_panel.detail.url_txt") %></th><!--
<th><%= t("views.right_panel.detail.gateway") %> <%= t("views.right_panel.detail.url_txt") %></th><!--
<th>Auth token</th>
<th>Merchant account</th> -->
<th><%= t("views.right_panel.detail.actions") %></th>
@@ -26,20 +35,20 @@
<td><%= settings_payment_method_setting.payment_method %></td>
<td><%= settings_payment_method_setting.is_active %></td>
<td><%= settings_payment_method_setting.gateway_communication_type %></td>
<td><%= settings_payment_method_setting.gateway_url %></td><!--
<td><%= settings_payment_method_setting.gateway_url %></td><!--
<td><%= settings_payment_method_setting.auth_token %></td>
<td><%= settings_payment_method_setting.merchant_account_id %></td> -->
<td>
<%= link_to t("views.btn.show"), settings_payment_method_setting_path(settings_payment_method_setting),:class => 'btn btn-info btn-sm waves-effect' %>
<%= link_to t("views.btn.edit"), edit_settings_payment_method_setting_path(settings_payment_method_setting),:class => 'btn btn-primary btn-sm waves-effect' %>
<!-- <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%=settings_payment_method_setting_path(settings_payment_method_setting)%>" 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>
<h6>This action can't be undo. </h6>
</span> -->
</td>
</tr>
@@ -71,6 +80,6 @@
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>