From d3dfabd66a8eb184dcca4f76122ec1f0592d7e58 Mon Sep 17 00:00:00 2001 From: yamin Date: Mon, 23 Oct 2017 13:38:36 +0630 Subject: [PATCH 1/3] delte ui change --- app/views/settings/accounts/index.html.erb | 11 +------- app/views/settings/accounts/show.html.erb | 25 +++++++++++++------ .../settings/membership_actions/show.html.erb | 9 ++++++- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/app/views/settings/accounts/index.html.erb b/app/views/settings/accounts/index.html.erb index abaea5b6..d2a1c9a4 100755 --- a/app/views/settings/accounts/index.html.erb +++ b/app/views/settings/accounts/index.html.erb @@ -39,17 +39,8 @@ <%= account.bonus %> <%= account.rebate %> + <%= link_to t("views.btn.show"), settings_account_path(account),:class => 'btn btn-info btn-sm waves-effect' %> <%= link_to t("views.btn.edit"), edit_settings_account_path(account),:class => 'btn btn-primary btn-sm waves-effect' %> - - - - - <% end %> diff --git a/app/views/settings/accounts/show.html.erb b/app/views/settings/accounts/show.html.erb index a9142040..8321c487 100755 --- a/app/views/settings/accounts/show.html.erb +++ b/app/views/settings/accounts/show.html.erb @@ -1,11 +1,13 @@
- +
    +
  1. Home
    2. +
  2. Account
    3. +
  3. Details
    4. + + <%= link_to t('.back', :default => t("views.btn.back")), settings_account_path %> + +

@@ -34,7 +36,16 @@ <%= @settings_account.rebate %> - <%= link_to t("views.btn.edit"), edit_settings_account_path(@settings_account, @settings_account),:class => 'btn btn-primary btn-lg waves-effect' %> + <%= link_to t("views.btn.edit"), edit_settings_account_path(@settings_account, @settings_account),:class => 'btn btn-primary btn-lg waves-effect' %> + + + + diff --git a/app/views/settings/membership_actions/show.html.erb b/app/views/settings/membership_actions/show.html.erb index 5729e60d..87bb17ba 100755 --- a/app/views/settings/membership_actions/show.html.erb +++ b/app/views/settings/membership_actions/show.html.erb @@ -48,7 +48,14 @@ <%= link_to t("views.btn.edit"), edit_settings_membership_action_path(@settings_membership_action),:class => 'btn btn-primary btn-sm waves-effect' %> - <%= link_to t("views.btn.delete"), settings_membership_action_path(@settings_membership_action), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-sm waves-effect', :disabled => "disabled" %> + + + From 735dc228db83fd8fb42dd2e62c7a13212640b6ac Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 23 Oct 2017 13:58:54 +0630 Subject: [PATCH 2/3] update admin bsb for add order design --- app/assets/javascripts/custom.js | 3 +++ app/assets/stylesheets/addorder.scss | 11 ++++------- app/controllers/origami/addorders_controller.rb | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js index e5b09e92..1509a71b 100644 --- a/app/assets/javascripts/custom.js +++ b/app/assets/javascripts/custom.js @@ -26,6 +26,9 @@ $(function(){ var method = $(this).attr('data-method'); var url = $(this).attr('data-ref'); var html_text = $( this ).siblings( "#delete_text" ).html(); + console.log(method); + console.log(url); + console.log(html_text); swal({ title: "Confirmation", text: html_text, diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss index d81a2d85..7d3add13 100755 --- a/app/assets/stylesheets/addorder.scss +++ b/app/assets/stylesheets/addorder.scss @@ -1,9 +1,3 @@ -@import "bootstrap"; -@import "font-awesome"; -@import "theme"; -@import "jquery-ui"; -@import "bootstrap-datepicker3"; - .custom-card-head{ height: 40px; background-color: #54A5AF; @@ -11,7 +5,6 @@ color :#fff; } - .custom-card { border: 2px solid rgba(0, 0, 0, 0.125) !important; } @@ -126,6 +119,10 @@ element.style { margin-bottom:10px; } +section.content{ + padding-top:-50px !important; +} + /*Loading gif for payment*/ #loading_wrapper{ diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index 0f1026a2..9e096a04 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -34,7 +34,6 @@ class Origami::AddordersController < BaseOrigamiController def get_menu_category () if (params[:id]) - puts "sssssssssssss" puts params[:id] #Pull this menu @menu = MenuCategory.find_by_id(params[:id]) From 14fc9b1a45185584462204e52cc6a2f060d5ebe0 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 23 Oct 2017 16:14:29 +0630 Subject: [PATCH 3/3] update oqs --- app/assets/javascripts/OQS.js | 142 ++++++++++++++++------------- app/assets/javascripts/addorder.js | 26 +++--- app/assets/stylesheets/reset.css | 4 +- app/views/oqs/home/index.html.erb | 18 ++-- 4 files changed, 100 insertions(+), 90 deletions(-) diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index bd59ffad..620e7490 100755 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -46,72 +46,71 @@ $(document).ready(function(){ }); //End Click function show_details(url){ - var oqs_append = $('.oqs_append'); - oqs_append.empty(); - var filter = $('.filter').text(); - //Start Ajax - $.ajax({ - type: "GET", - url: url, - data: {'filter':filter}, - dataType: "json", - success: function(data) { - for(var field in data) { - var price = parseFloat(data[field].price).toFixed(2); + var oqs_append = $('.oqs_append'); + oqs_append.empty(); + var filter = $('.filter').text(); + //Start Ajax + $.ajax({ + type: "GET", + url: url, + data: {'filter':filter}, + dataType: "json", + success: function(data) { + for(var field in data) { + var price = parseFloat(data[field].price).toFixed(2); - if (data[field]["options"] == "[]" || data[field]["options"] == "") { - var options = ""; - }else{ - var options = data.options; + if (data[field]["options"] == "[]" || data[field]["options"] == "") { + var options = ""; + }else{ + var options = data.options; + } + + var date = new Date(data[field]["created_at"]); + var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' + date.getHours()+ ':' + date.getMinutes(); + + row ='
' + +'
' + +'
' + +''+data[field]["table_type"]+'- ' + +''+ data[field]["zone"] +'' + +''+ data[field]["order_id"] +'' + +'
' + + +'
' + +''+ data[field]["item_name"] +'- ' + +''+ data[field]["qty"] +' ' + +'
' + + +'

'+ options +'

' + + +'

' + +'Order at' + +''+ show_date +' - ' + + +''+ data[field]["item_order_by"] +' ' + +' ' + +'

' + + +' ' + +' ' + +'
' + + +'
' + +'' + +' ' + +'
' + + +'
'; + + + + $('.oqs_append').append(row); } - - var date = new Date(data[field]["created_at"]); - var show_date = date.getDate() + "-" + date.getMonth() + "-" + date.getFullYear() + ' ' + date.getHours()+ ':' + date.getMinutes(); - - row ='
' - +'
' - +'

' - +''+data[field]["table_type"]+'- ' - +''+ data[field]["zone"] +'' - +''+ data[field]["order_id"] +'- ' - +'

' - - +'

' - +''+ data[field]["item_name"] +'- ' - +''+ data[field]["qty"] +'- ' - +'

' - - +'

'+ options +'

' - - +'

' - +'Order at' - +''+ show_date +' - ' - - +''+ data[field]["item_order_by"] +' ' - +' ' - +'

' - - +' ' - +' ' - +'
' - - +'
' - +'' - +' ' - +'
' - - +'
'; - - - - $('.oqs_append').append(row); - } - - } - }); - //end Ajax - - } + + } + }); + //end Ajax + } $(document).on('click', '.queue_station', function(event){ var orderZone=$(this).children().children().children('.order-zone').text().trim(); @@ -198,7 +197,20 @@ $(document).ready(function(){ // update queue item count in completed station $("#completed_count").text(parseInt($("#completed_count").text()) + data.length); - alert("updated!"); + swal({ + title: "Infomation !", + text: 'Order has been successfully created', + confirmButtonColor: "green", + confirmButtonText: "Yes!", + closeOnConfirm: false, + }, function () { + if(table_type == "Table"){ + window.location.href = "/origami/table/" + table_id + } + else { + window.location.href = "/origami/room/" + table_id + } + }); // Page reload location.reload(); } diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index d523e7e6..a2d77325 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -663,25 +663,21 @@ $(function(){ data: params, dataType: "json", success:function(result){ - $("#loading_wrapper").hide(); - $.confirm({ - title: 'Infomation!', - content: "Order has been successfully created", - buttons: { - confirm: { - text: 'Ok', - btnClass: 'btn-green', - action: function(){ - if(table_type == "Table"){ + $("#loading_wrapper").hide(); + swal({ + title: "Infomation !", + text: 'Order has been successfully created', + confirmButtonColor: "green", + confirmButtonText: "Yes!", + closeOnConfirm: false, + }, function () { + if(table_type == "Table"){ window.location.href = "/origami/table/" + table_id } else { window.location.href = "/origami/room/" + table_id - } - } - } - } - }); + } + }); } }); }); diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css index c5c3af2f..dd688ee4 100644 --- a/app/assets/stylesheets/reset.css +++ b/app/assets/stylesheets/reset.css @@ -177,7 +177,9 @@ section.content { .hidden{ display: none !important; } - +.hide{ + display: none !important; +} .sidebar .menu .list a { padding: 5px 13px; } diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 07374231..a0fc23a7 100755 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -1,4 +1,4 @@ -
+
  • Home
    • @@ -13,7 +13,7 @@
    -
    +
    <%= form_tag oqs_root_path, :method => :get do %>
    @@ -76,26 +76,26 @@
    -
    +
    <% @queue_completed_item.each do |qid| %>
    -

    +

    <%= qid.type %> - <%= qid.zone %> <%= qid.order_id %> -
    -

    +

    +
    <%= qid.item_name %> [x <%= qid.qty %> ] -
    +

    <%= qid.options == "[]"? "" : qid.options %>

    @@ -187,7 +187,7 @@
    - -->