sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more order page css tweaks

Browse Source
This commit is contained in:
arzynik 2014-10-30 16:42:32 -07:00
parent c02829c8f1
commit 1dd38eb4b0
2 changed files with 57 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
include/views/default/cockpit2/frontend/drivers/drivers-order.phtml
View File

@ -20,8 +20,6 @@
<div class="divider"></div>
</div>
</div>
<div ng-if="order.lastStatus['self-reply'] == 'rejected'">
<div class="box-content-rejected box-order-status">
@ -65,24 +63,33 @@
</div>
</div>
<div ng-if="order.lastStatus[ 'delivery-status' ].accepted.name && order.lastStatus[ 'delivery-status' ].accepted.id_admin != account.user.id_admin && !order.lastStatus[ 'delivery-status' ].pickedup" class="box-content2 content-padding">
<div class="dialog-message dialog-message-error">
DO NOT DELIVER. THIS ORDER HAS ALREADY BEEN ACCEPTED BY <span class="delivery-name">{{order.lastStatus[ 'delivery-status' ].accepted.name}}</span>.
<div ng-if="order.lastStatus[ 'delivery-status' ].accepted.name && order.lastStatus[ 'delivery-status' ].accepted.id_admin != account.user.id_admin && !order.lastStatus[ 'delivery-status' ].pickedup" class="content-padding">
<div class="dialog-message dialog-message-error">
<div class="message">
<div class="dialog-title"><b>DO NOT DELIVER</b></div>
<div class="dialog-subtext">THIS ORDER HAS ALREADY BEEN ACCEPTED BY <span class="delivery-name">{{order.lastStatus[ 'delivery-status' ].accepted.name}}</span>.</div>
</div>
</div>
</div>
<div ng-if="order.lastStatus[ 'delivery-status' ].pickedup.name && order.lastStatus[ 'delivery-status' ].pickedup.id_admin != account.user.id_admin && !order.lastStatus[ 'delivery-status' ].delivered" class="box-content2 content-padding">
<div class="dialog-message dialog-message-error">
This order has been picked up by <span class="delivery-name">{{order.lastStatus[ 'delivery-status' ].pickedup.name}}</span>.
<div ng-if="order.lastStatus[ 'delivery-status' ].pickedup.name && order.lastStatus[ 'delivery-status' ].pickedup.id_admin != account.user.id_admin && !order.lastStatus[ 'delivery-status' ].delivered" class="content-padding">
<div class="dialog-message dialog-message-error">
<div class="message">
This order has been picked up by <span class="delivery-name">{{order.lastStatus[ 'delivery-status' ].pickedup.name}}</span>.
</div>
</div>
</div>
<div ng-if="order.lastStatus[ 'delivery-status' ].delivered && order.lastStatus[ 'delivery-status'].delivered.id_admin != account.user.id_admin" class="content-padding">
<div class="dialog-message dialog-message-error">
<div class="message">
This order has been delivered by <span class="delivery-name">{{order.lastStatus[ 'delivery-status' ].delivered.name}}</span>
</div>
</div>
</div>
<div ng-if="order.lastStatus[ 'delivery-status' ].delivered && order.lastStatus[ 'delivery-status'].delivered.id_admin != account.user.id_admin" class="box-content2 content-padding">
<div class="dialog-message dialog-message-error"
This order has been delivered by <span class="delivery-name">{{order.lastStatus[ 'delivery-status' ].delivered.name}}</span>
</div>
</div>
<div class="content-padding" ng-if="( !order.lastStatus[ 'delivery-status' ].accepted || order.lastStatus[ 'delivery-status' ].accepted.id_admin == account.user.id_admin ) && order.lastStatus[ 'delivery-status' ].delivered" >
<div ng-if="order.lastStatus[ 'delivery-status' ].delivered.id_admin == account.user.id_admin && order.lastStatus[ 'delivery-status' ].delivered" class="box-content-delivered box-order-status">
@ -93,15 +100,13 @@
</div>
<div class="divider"></div>
</div>
</div>
<!-- /actions -->
<div class="content-padding">
<div class="status"></div>
<div class="dialog-message dialog-message-notice check-reminder">
<div class="dialog-message dialog-message-notice check-reminder" ng-if="order.lastStatus['delivery-status'].accepted.id_admin == account.user.id_admin&& !order.lastStatus[ 'delivery-status' ].delivered">
<b>Double check</b> to make sure you received exactly the right food!
</div>
@ -206,30 +211,25 @@
<div class="order-map" style="background: url('https://maps.googleapis.com/maps/api/staticmap?size=640x300&markers=color:green%7Clabel:A%7C{{order.address | clearAddress}}&markers=color:red%7Clabel:B%7C{{order._restaurant_lat}},{{order._restaurant_lon}}&sensor=false&visual_refresh=true');"></div>
</a>
<br>
<span ng-if="order.notes">
<div class="order-comment-arrow"></div>
<div class="order-comment">
<i class="fa fa-bullhorn"></i> <p> &nbsp; {{ order.notes | nl2br }}</p>
<div class="order-item-block-big order-notes" ng-if="order.notes">
<div class="order-icon2"><i class="fa fa-bullhorn"></i></div>
<div class="order-info2 order-info-small">
{{ order.notes | nl2br }}
</div>
</span>
<span ng-if="!order.notes">
</div>
<br>
</span>
<br><br>
<div class="divider dots"></div>
<br><br>
<div class="content-padding box-content2">
<div class="order-contents">
<table width="100%" celpadding="0" cellspacing="0" class="detail">
<thead>
<td class="topitem">Qty</td>
<td class="topitem order-contents-item-qty">Qty</td>
<td class="topitem itemname">Item</td>
<td class="topitem itemprice">Store Price</td>
</thead>
<tbody>
<tr ng-repeat="dish in order._dishes">
<td class="fooditem">1</td>
<td class="fooditem order-contents-item-qty">1</td>
<td class="fooditem dish-name">{{dish.name}} {{dish.options.without_default_options}} {{dish.options.with_option}} {{dish.options.select_options}} </td>
<td class="fooditem dish-price">
${{dish.price.regular | formatPrice}}
@ -271,7 +271,7 @@
<tr class="order-total-row">
<td></td>
<td class="order-total-text">Total</td>
<td class="dish-price">
<td class="dish-price order-total-text">
${{order._final_price | formatPrice}}
</td>
</tr>

75
www/assets/cockpit/scss/cockpit.scss
View File

@ -1733,6 +1733,7 @@ h4.title{
.pickedup .notMyOrder .row-status{
background-color: #444c57;
color: #fff;
}
.pickedup .vert-divider{
@ -1935,11 +1936,7 @@ h4.title{
.info-block {
background: #fff;
color: #000;
padding: 1em;
}
.info-block .order-info {
width: 100%;
padding: 1em 1em .9em 1em;
}
.info-block .order-icon {
@ -2077,30 +2074,6 @@ h4.title{
display: inline-block;
}
.order-comment-arrow {
width: 0;
height: 0;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
border-bottom: 7px solid #DF5850;
margin-left: 1.2em;
}
.order-comment {
background: #DF5850;
color: #fff;
padding: .9em .9em .8em 1em;
border-radius: 4px;
margin-bottom: .8em;
font-size: 1.2em;
font-family: Ruda;
}
.fa-bullhorn{
float:left;
font-size: 1.5em;
}
.icon-chef {
background: url(http://dev.crunchr.co/assets/images/micro/icon-chef.svg) no-repeat;
background-position: top center;
@ -2117,22 +2090,20 @@ h4.title{
background-size:contain;
}
td {
border: 0;
padding: .5em;
}
.fooditem {
border-bottom: 1px solid #999;
}
.order-contents-item-qty {
width: 1em;
}
.dish-name{
text-align: center;
text-align: left;
width: 100%;
}
.dish-price{
font-size: 1.2em;
color: #666;
text-align: right;
}
@ -2144,6 +2115,7 @@ h4.title{
.order-total-text{
text-align: right;
font-size: 1.2em;
color: #000;
}
.order-tip-cash{
@ -2151,12 +2123,11 @@ h4.title{
}
.topitem, .fooditem {
border-bottom: 2px solid #999;
font-size: 1.2em;
border-bottom: 1px solid #c7c7c7;
}
.itemname{
text-align: center;
text-align: left;
}
.itemprice{
@ -2282,6 +2253,15 @@ b, strong{ font-weight: bold; }
border: 5px;
}
.order-contents {
background: #fff;
margin-bottom: 1.5em;
}
.order-contents td {
padding: .7em;
}
.check-reminder{
font-size: 1.2em;
text-align: left;
@ -2291,17 +2271,12 @@ b, strong{ font-weight: bold; }
.order-header{
color: #5d5f63;
font-size: 2.3em;
font-weight: 900;
text-align: right;
margin: 1em 0 .5em 0;
font-size: 5em;
font-weight: bold;
text-align: center;
margin: .5em 0 .5em 0;
font-size: 18vw;
}
.order-header td:first-of-type{
padding-right: 0px;
}
.order-header td:last-of-type{
padding-left: 0px;
}
/**