From 8388192a81be9a92fea7fda086d2a67055018955 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 8 Jun 2017 14:46:35 +0630 Subject: [PATCH] delete view origami file --- Gemfile | 9 +- Gemfile.lock | 27 +- app/views/origami/home/index.html.erb | 367 ---------------------- app/views/origami/home/index_old.html.erb | 328 ------------------- 4 files changed, 9 insertions(+), 722 deletions(-) delete mode 100644 app/views/origami/home/index.html.erb delete mode 100644 app/views/origami/home/index_old.html.erb diff --git a/Gemfile b/Gemfile index a272cec9..551503f9 100644 --- a/Gemfile +++ b/Gemfile @@ -10,11 +10,11 @@ end gem 'rails', '~> 5.1.0' # Use mysql as the database for Active Record -#gem 'mysql2', '>= 0.3.18', '< 0.5' +gem 'mysql2', '>= 0.3.18', '< 0.5' #Use PosgreSQL -gem 'pg' +#gem 'pg' # redis server for cable @@ -46,9 +46,6 @@ gem 'to_xls-rails' #Reporting gem #gem 'compendium' -# Pagination -gem 'kaminari', :git => "git://github.com/amatsuda/kaminari.git", :branch => 'master' - # Use jquery as the JavaScript library gem 'jquery-rails' # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks @@ -63,7 +60,7 @@ gem 'bcrypt', '~> 3.1.7' gem 'sidekiq' # Pagination -gem 'kaminari', :git => "git://github.com/amatsuda/kaminari.git", :branch => 'master' +gem 'kaminari', '~> 0.16.3' # Use Capistrano for deployment # gem 'capistrano-rails', group: :development diff --git a/Gemfile.lock b/Gemfile.lock index 2c4c94b3..7281b442 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,21 +1,3 @@ -GIT - remote: git://github.com/amatsuda/kaminari.git - revision: bc52ae73d41386d344b5d1b18e689e5a988f1a03 - branch: master - specs: - kaminari (1.0.1) - activesupport (>= 4.1.0) - kaminari-actionview (= 1.0.1) - kaminari-activerecord (= 1.0.1) - kaminari-core (= 1.0.1) - kaminari-actionview (1.0.1) - actionview - kaminari-core (= 1.0.1) - kaminari-activerecord (1.0.1) - activerecord - kaminari-core (= 1.0.1) - kaminari-core (1.0.1) - GEM remote: https://rubygems.org/ specs: @@ -104,6 +86,9 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) + kaminari (0.16.3) + actionpack (>= 3.0.0) + activesupport (>= 3.0.0) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -119,11 +104,11 @@ GEM minitest (5.10.2) multi_json (1.12.1) multi_xml (0.6.0) + mysql2 (0.4.6) nio4r (2.1.0) nokogiri (1.7.2) mini_portile2 (~> 2.1.0) pdf-core (0.7.0) - pg (0.20.0) prawn (2.2.2) pdf-core (~> 0.7.0) ttfunk (~> 1.5) @@ -256,9 +241,9 @@ DEPENDENCIES httparty (~> 0.15.5) jbuilder (~> 2.5) jquery-rails - kaminari! + kaminari (~> 0.16.3) listen (~> 3.0.5) - pg + mysql2 (>= 0.3.18, < 0.5) prawn prawn-table puma (~> 3.0) diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb deleted file mode 100644 index 48de0315..00000000 --- a/app/views/origami/home/index.html.erb +++ /dev/null @@ -1,367 +0,0 @@ -
- -
- - - - - -
- - -
-
- <% - @booking_orders.each do |bko| - # Assigned Id for new Order? Sale? - unique_id="" - # For CSS- Class for Order? Sale? - sale_status="" - if bko.order_status == 'new' - unique_id=bko.booking_id - else - unique_id=bko.sale_id - sale_status="sold" - end - %> -
-
- -

<%= bko.table_name %>

-

- Receipt No : - - <%= bko.receipt_no %> - -

-

- Order Status : - - <%= bko.order_status %> - - -

-
-
- <% - end - %> -
-
- - -
-
- <% - @booking_rooms.each do |rmo| - # Assigned Id for new Order? Sale? - unique_id="" - # For CSS- Class for Order? Sale? - sale_status="" - if rmo.order_status == 'new' - unique_id=rmo.booking_id - else - unique_id=rmo.sale_id - sale_status="sold" - end - %> -
-
- -

<%= rmo.room_name %>

-

- Receipt No : - - <%= rmo.receipt_no %> - -

-

- Order Status : - - <%= rmo.order_status %> - - -

-
-
- <% - end - %> -
-
- - -
-
- <% - @orders.each do |odr| - # Assigned Id for new Order? Sale? - unique_id="" - # For CSS- Class for Order? Sale? - sale_status="" - if odr.order_status == 'new' - unique_id=odr.booking_id - else - unique_id=odr.sale_id - sale_status="sold" - end - %> -
-
- -

<%= odr.table_name %>

-

- Receipt No : - - <%= odr.receipt_no %> - -

-

- Order Status : - - <%= odr.order_status %> - - -

-
-
- <% - end - %> -
- -
-
- -
- - - -
-
-
-
ORDER DETAILS -
-
-
-
-
-

Receipt No:

-

Cashier:

-
-
-

Date:

-
-
-
- - - - - - - - - -
ItemsQTY - Price -
-
- -
-
-

- -
- - - - - - - - - - - -
-
- - - diff --git a/app/views/origami/home/index_old.html.erb b/app/views/origami/home/index_old.html.erb deleted file mode 100644 index d480cf8d..00000000 --- a/app/views/origami/home/index_old.html.erb +++ /dev/null @@ -1,328 +0,0 @@ -
-
- - - - - - -
- - -
- -
- - <% if @booking_orders %> - <% @booking_orders.each do |booking_order| %> - <% if booking_order.order_status != "new" %> -
-
-

- <%=booking_order.table_name%>

- Receipt No : <%=booking_order.receipt_no%>
- Order Status : <%=booking_order.order_status %> -
-
- <% else %> -
-
-

<%=booking_order.table_name%>

- Order Status : <%=booking_order.order_status %> -
-
- <% end %> - <%end %> - <%end %> -
-
- - -
- -
- - <% if @booking_rooms %> - <% @booking_rooms.each do |booking_room| %> - <% if !booking_room.order_status = 'new'%> -
-
-

- <%=booking_room.room_name%>

- Receipt No : <%=booking_room.receipt_no%>
- Order Status : <%=booking_room.order_status %> -
-
- <% else %> -
-
-

<%=booking_room.room_name%>ddd

\ - Order Status : <%=booking_room.order_status %> -
-
- <% end %> - <%end %> - <%end %> -
-
- - -
- - -
- - <% if @orders %> - <% @orders.each do |order| %> - <% if !order.order_status = 'new'%> -
-
-

- Order No:<%=order.order_id%>

- Receipt No : <%=order.receipt_no%>
- Order Status : <%=order.order_status %> -
-
- <% else %> -
-
-

Order No:<%=order.order_id%>

- Order Status : <%=order.order_status %> -
-
- <% end %> - <%end %> - <%end %> -
-
- -
- -
- -
-
-
-
ORDER DETAILS -

-
-
-
-
- - - - - - -
ItemsQTY - Price -
-
-
- - - - - - - - - -
- - - - - -
-
- - -
-
-
- -
- - - - - - - - - - - - -
-
- -