finished order tab view and customer tab
This commit is contained in:
Aung Myo
4
Gemfile
4
Gemfile
@@ -9,8 +9,8 @@ end
|
||||
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
|
||||
gem 'rails', '~> 5.1.0'
|
||||
# Use mysql as the database for Active Record
|
||||
#gem 'mysql2', '>= 0.3.18', '< 0.5'
|
||||
gem 'pg'
|
||||
gem 'mysql2', '>= 0.3.18', '< 0.5'
|
||||
#gem 'pg'
|
||||
# Use Puma as the app server
|
||||
gem 'puma', '~> 3.0'
|
||||
# Use SCSS for stylesheets
|
||||
|
||||
@@ -96,11 +96,11 @@ GEM
|
||||
mini_portile2 (2.1.0)
|
||||
minitest (5.10.2)
|
||||
multi_json (1.12.1)
|
||||
mysql2 (0.4.6)
|
||||
nio4r (2.0.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)
|
||||
@@ -232,7 +232,7 @@ DEPENDENCIES
|
||||
jbuilder (~> 2.5)
|
||||
jquery-rails
|
||||
listen (~> 3.0.5)
|
||||
pg
|
||||
mysql2 (>= 0.3.18, < 0.5)
|
||||
prawn
|
||||
prawn-table
|
||||
puma (~> 3.0)
|
||||
|
||||
@@ -1,16 +1,22 @@
|
||||
class Crm::HomeController < BaseCrmController
|
||||
def index
|
||||
|
||||
@booking = Booking.select("bookings.id as booking_id,
|
||||
bookings.checkin_at,
|
||||
od.customer_id as customer,
|
||||
odt.id")
|
||||
# @booking = Booking.all
|
||||
|
||||
@booking = Booking.select("bookings.id as booking_id,
|
||||
bookings.checkin_at,
|
||||
bookings.checkin_by,
|
||||
bookings.dining_facility_id,
|
||||
od.customer_id as customer,
|
||||
od.item_count as count,
|
||||
odt.id as order_item_id,
|
||||
odt.item_name as item_name")
|
||||
.joins("join booking_orders as bko ON bko.booking_id = bookings.id")
|
||||
.joins("right join orders as od ON od.id = bko.order_id")
|
||||
.joins("right join order_items as odt ON odt.order_id=od.id")
|
||||
.order("bookings.id DESC")
|
||||
.order("bookings.id DESC")
|
||||
|
||||
|
||||
@customer = Customer.all
|
||||
|
||||
end
|
||||
def show
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
class OrderQueueItem < ApplicationRecord
|
||||
end
|
||||
26
app/views/crm/home/_booking.html.erb
Normal file
26
app/views/crm/home/_booking.html.erb
Normal file
@@ -0,0 +1,26 @@
|
||||
<!--- Booking Items -->
|
||||
<div class="card-columns" style="padding-top:10px">
|
||||
|
||||
<% @i = 0 %>
|
||||
<% @booking.each do |booking| %>
|
||||
<div class="card">
|
||||
<div class="card-block">
|
||||
<h4 class="card-title">
|
||||
<%= @i += 1 %> . <%= booking.dining_facility.name %>
|
||||
- <%= booking.item_name %>
|
||||
</h4>
|
||||
<p class="card-text">Medium, Fries, Salad
|
||||
</p>
|
||||
<p class="card-text">
|
||||
<small class="text-muted">
|
||||
Order at <%= booking.checkin_at.strftime("%H,%m") %>, <%= booking.checkin_by %>
|
||||
</small>
|
||||
</p>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<button id="#id" class="btn btn-primary btn-lg btn-block">COMPLETE</button>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
<!--- end of Items-->
|
||||
</div>
|
||||
23
app/views/crm/home/_customer.html.erb
Normal file
23
app/views/crm/home/_customer.html.erb
Normal file
@@ -0,0 +1,23 @@
|
||||
<!--- Booking Items -->
|
||||
<div class="card-columns" style="padding-top:10px">
|
||||
<% @customer.each do |customer| %>
|
||||
<div class="card">
|
||||
<div class="card-block">
|
||||
<!-- <h4 class="card-title">Customer Name : <%= customer.name %></h4> -->
|
||||
<p class="card-text">Name : <%= customer.name %></p>
|
||||
<p class="card-text">Contact No : <%= customer.contact_no %></p>
|
||||
<p class="card-text">Email : <%= customer.email %></p>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<div class="card card-inverse card-primary ">
|
||||
<div class="card-block">
|
||||
<h4 class="card-title">Card title</h4>
|
||||
<p class="card-text">This card has supporting text below as a natural lead-in to additional content.</p>
|
||||
<p class="card-text"><small class="text-muted">Last updated 3 mins ago</small></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
29
app/views/crm/home/_queue.html.erb
Normal file
29
app/views/crm/home/_queue.html.erb
Normal file
@@ -0,0 +1,29 @@
|
||||
<div class="card-columns" style="padding-top:10px">
|
||||
<div class="card">
|
||||
<div class="card-block order-completed">
|
||||
<h4 class="card-title">9. Table 4 - Beef Steak [x3]</h4>
|
||||
<p class="card-text">Well Done, Fries, Salad</p>
|
||||
<p class="card-text">
|
||||
<small class="text-muted">Order at 12:23, Kyaw Lwin</small> |
|
||||
<small class="text-muted">Printed at 12:23</small> |
|
||||
<small class="text-muted">Completed at 12:43</small>
|
||||
</p>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="card">
|
||||
<div class="card-block order-void">
|
||||
<h4 class="card-title">9. Table 4 - Beef Steak [x3]</h4>
|
||||
<p class="card-text">Well Done, Fries, Salad</p>
|
||||
<p class="card-text"><small class="text-muted">Order at 12:23, Kyaw Lwin</small></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card">
|
||||
<div class="card-block">
|
||||
<h4 class="card-title">9. Table 4 - Beef Steak [x3]</h4>
|
||||
<p class="card-text">Well Done, Fries, Salad</p>
|
||||
<p class="card-text"><small class="text-muted">Order at 12:23, Kyaw Lwin</small></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -8,7 +8,7 @@
|
||||
<a class="nav-link" data-toggle="tab" href="#completed" role="tab">Queue <span class="badge badge-pill badge-default">2000</span></a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link active" data-toggle="tab" href="#tables" role="tab">Bookings <span class="badge badge-pill badge-default">18</span></a>
|
||||
<a class="nav-link active" data-toggle="tab" href="#tables" role="tab">Bookings <span class="badge badge-pill badge-default"><%= @count %></span></a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" data-toggle="tab" href="#rooms" role="tab">Customers</a>
|
||||
@@ -19,162 +19,22 @@
|
||||
<div class="tab-content" style="min-height:670px; max-height:670px; overflow-y:scroll">
|
||||
<!--- Panel 0 - Completed -->
|
||||
<div class="tab-pane" id="completed" role="tabpanel" style="min-height:670px; max-height:670px; overflow-y:scroll">
|
||||
<div class="card-columns" style="padding-top:10px">
|
||||
<div class="card">
|
||||
<div class="card-block order-completed">
|
||||
<h4 class="card-title">9. Table 4 - Beef Steak [x3]</h4>
|
||||
<p class="card-text">Well Done, Fries, Salad</p>
|
||||
<p class="card-text">
|
||||
<small class="text-muted">Order at 12:23, Kyaw Lwin</small> |
|
||||
<small class="text-muted">Printed at 12:23</small> |
|
||||
<small class="text-muted">Completed at 12:43</small>
|
||||
</p>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="card">
|
||||
<div class="card-block order-void">
|
||||
<h4 class="card-title">9. Table 4 - Beef Steak [x3]</h4>
|
||||
<p class="card-text">Well Done, Fries, Salad</p>
|
||||
<p class="card-text"><small class="text-muted">Order at 12:23, Kyaw Lwin</small></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card">
|
||||
<div class="card-block">
|
||||
<h4 class="card-title">9. Table 4 - Beef Steak [x3]</h4>
|
||||
<p class="card-text">Well Done, Fries, Salad</p>
|
||||
<p class="card-text"><small class="text-muted">Order at 12:23, Kyaw Lwin</small></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<%= render :partial => 'queue' %>
|
||||
|
||||
</div>
|
||||
<!-- Panel 1 - Tables -->
|
||||
<div class="tab-pane active" id="tables" role="tabpanel">
|
||||
<!--- Booking Items -->
|
||||
<div class="card-columns" style="padding-top:10px">
|
||||
|
||||
<%= render :partial => 'booking' %>
|
||||
|
||||
<% @i = 0 %>
|
||||
<% @booking.each do |booking| %>
|
||||
<div class="card">
|
||||
<div class="card-block">
|
||||
<h4 class="card-title">
|
||||
saf
|
||||
</h4>
|
||||
<p class="card-text">fries, Salad
|
||||
asdf
|
||||
</p>
|
||||
<p class="card-text">
|
||||
<small class="text-muted">
|
||||
adf
|
||||
</small>
|
||||
</p>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<button id="#id" class="btn btn-primary btn-lg btn-block">COMPLETE</button>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<div class="card">
|
||||
<div class="card-block order-void">
|
||||
<h4 class="card-title">9. Table 4 - Beef Steak [x3]</h4>
|
||||
<p class="card-text">Well Done, Fries, Salad</p>
|
||||
<p class="card-text"><small class="text-muted">Order at 12:23, Kyaw Lwin</small></p>
|
||||
</div>
|
||||
<div class="card-footer">
|
||||
<button id="#id" class="btn btn-primary btn-lg btn-block">COMPLETE</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<!--- end of Items-->
|
||||
</div>
|
||||
</div>
|
||||
<!-- Panel 1 - Tables - End -->
|
||||
<!-- Panel 2 - Rooms -->
|
||||
<div class="tab-pane" id="rooms" role="tabpanel" style="min-height:670px; max-height:670px; overflow-y:scroll">
|
||||
<!--- Booking Items -->
|
||||
<div class="card-columns" style="padding-top:10px">
|
||||
<div class="card">
|
||||
<div class="card-block">
|
||||
<h4 class="card-title">Card title that wraps to a new line</h4>
|
||||
<p class="card-text">This is a longer card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card p-3">
|
||||
<blockquote class="card-block card-blockquote">
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p>
|
||||
<footer>
|
||||
<small class="text-muted">
|
||||
Someone famous in <cite title="Source Title">Source Title</cite>
|
||||
</small>
|
||||
</footer>
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="card">
|
||||
<div class="card-block">
|
||||
<h4 class="card-title">Card title</h4>
|
||||
<p class="card-text">This card has supporting text below as a natural lead-in to additional content.</p>
|
||||
<p class="card-text"><small class="text-muted">Last updated 3 mins ago</small></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card card-inverse card-primary p-3 text-center">
|
||||
<blockquote class="card-blockquote">
|
||||
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat.</p>
|
||||
<footer>
|
||||
<small>
|
||||
Someone famous in <cite title="Source Title">Source Title</cite>
|
||||
</small>
|
||||
</footer>
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="card text-center">
|
||||
<div class="card-block">
|
||||
<h4 class="card-title">Card title</h4>
|
||||
<p class="card-text">This card has supporting text below as a natural lead-in to additional content.</p>
|
||||
<p class="card-text"><small class="text-muted">Last updated 3 mins ago</small></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<%= render :partial => 'customer' %>
|
||||
</div>
|
||||
<!-- Panel 2 - Rooms - End -->
|
||||
<!-- Panel 3 - Orders -->
|
||||
<div class="tab-pane" id="orders" role="tabpanel" style="min-height:670px; max-height:670px; overflow-y:scroll">
|
||||
|
||||
<!--- Booking Items -->
|
||||
<div class="card-columns" style="padding-top:10px">
|
||||
<div class="card">
|
||||
<div class="card-block">
|
||||
<h4 class="card-title">Card title that wraps to a new line</h4>
|
||||
<p class="card-text">This is a longer card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.</p>
|
||||
<p class="card-text"><small class="text-muted">Last updated 3 mins ago</small></p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="card">
|
||||
<div class="card-block">
|
||||
<h4 class="card-title">Card title</h4>
|
||||
<p class="card-text">This card has supporting text below as a natural lead-in to additional content.</p>
|
||||
<p class="card-text"><small class="text-muted">Last updated 3 mins ago</small></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card text-center">
|
||||
<div class="card-block">
|
||||
<h4 class="card-title">Card title</h4>
|
||||
<p class="card-text">This card has supporting text below as a natural lead-in to additional content.</p>
|
||||
<p class="card-text"><small class="text-muted">Last updated 3 mins ago</small></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
<!-- Panel 3 - Orders - End -->
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
class CreateOrderQueueItems < ActiveRecord::Migration[5.1]
|
||||
def change
|
||||
create_table :order_queue_items do |t|
|
||||
t.string :item_code, :null => false, :index => true
|
||||
t.references :order_queue_station, foreign_key: true
|
||||
t.references :order, foreign_key: true
|
||||
t.boolean :print_status
|
||||
t.boolean :delivery_status
|
||||
t.boolean :queue_status
|
||||
t.timestamps
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -1,5 +0,0 @@
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe OrderQueueItem, type: :model do
|
||||
pending "add some examples to (or delete) #{__FILE__}"
|
||||
end
|
||||
Reference in New Issue
Block a user