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

This commit is contained in:
Aung Myo
2017-11-15 13:40:35 +06:30
18 changed files with 320 additions and 138 deletions

View File

@@ -1,17 +1,36 @@
<form>
<div class="form-group">
<label for="exampleInputEmail1">Business Name</label>
<input type="text" class="form-control" id="restaurant_name" aria-describedby="business_name" placeholder="Enter business name">
<small id="business_name" class="form-text text-muted">Name of business this system is license to</small>
<form action="/install" method="POST" class="row">
<div class="col-md-6">
<div class="form-group">
<label for="exampleInputEmail1">Business Name</label>
<input type="text" class="form-control" name="restaurant_name" aria-describedby="business_name" placeholder="Enter business name">
<small id="business_name" class="form-text text-muted">Name of business this system is license to</small>
</div>
<div class="form-group">
<label for="lblLicenseKey">License Key</label>
<input type="text" class="form-control" name="license_key" aria-describedby="license_key" placeholder="Add License Key">
<small class="form-text text-muted">Add License Key from Email</small>
</div>
<div class="form-group">
<label for="lblAdministrator">Administrator Username</label>
<input type="text" class="form-control" name="admin_user" aria-describedby="admin_user" placeholder="Administrator Username">
<small id="admin_user" class="form-text text-muted">First Employee who will be assign as administrator</small>
</div>
<div class="form-group">
<label for="admin_password">Password</label>
<input type="password" class="form-control" name="admin_password" placeholder="Password">
</div>
</div>
<div class="form-group">
<label for="lblAdministrator">Administrator Username</label>
<input type="text" class="form-control" id="admin_user" aria-describedby="admin_user" placeholder="Administrator Username">
<small id="admin_user" class="form-text text-muted">First Employee who will be assign as administrator</small>
<div class="col-md-6">
<div class="form-group">
<label for="lblAdministrator">Database Username</label>
<input type="text" class="form-control" name="db_user" aria-describedby="db_user" placeholder="Database Username">
</div>
<div class="form-group">
<label for="admin_password">Database Password</label>
<input type="password" class="form-control" name="db_password" placeholder="Database Password">
</div>
</div>
<div class="form-group">
<label for="admin_password">Password</label>
<input type="password" class="form-control" id="admin_password" placeholder="Password">
<div class="col-md-12 text-center">
<button type="submit" class="btn btn-primary">Activate</button>
</div>
<button type="submit" class="btn btn-primary">Install</button>
</form>

View File

@@ -1,17 +1,11 @@
<div class="row">
<div class="col-lg-3 col-md-3"></div>
<div class="col-lg-6 col-md-6 ">
<div class="card">
<div class="card col-md-12">
<div class="card-block">
<h4 class="card-title text-center">New Restaurant Installation</h4>
<h4 class="card-title text-center">License Activation</h4>
<br/>
<h6 class="card-subtitle mb-2 text-muted">Welcome to new installation of SmartSales Restaurant Edition</h6>
<p class="card-text">Please provide us with following details to setup necessary user account and base system settings.</p>
<%= render "install/form" %>
</div>
</div>
</div>
<div class="col-lg-3 col-md-3"></div>
</div>

View File

@@ -10,11 +10,26 @@
<%= csrf_meta_tags %>
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
<style>
.page {
padding-left: 0;
max-width: 80%;
margin: 2% auto;
overflow-x: hidden;
background-color: #2790a5;
}
.page .box {
display: block;
width: 100%;
color: #000;
}
</style>
</head>
<body>
<div class="container-fluid">
<body class="page">
<div class="box">
<%= yield %>
</div>

View File

@@ -42,16 +42,14 @@
<% if table.status == 'occupied' %>
<% if table.get_booking.nil? %>
<div class="card tables red text-white" data-id="<%= table.id %>">
<div class="card-block">
<%= table.get_booking %>
<div class="card-block">
Zone <%= table.zone_id %> <br>
Table <%= table.name %> ( <%= table.seater %> Seat )
</div>
</div>
<% else %>
<div class="card tables blue text-white" data-id="<%= table.id %>">
<div class="card-block">
<%= table.get_booking %>
<div class="card-block">
Zone <%= table.zone_id %> <br>
Table <%= table.name %> ( <%= table.seater %> Seat )
</div>