// orders WIP
This commit is contained in:
Kevin Granger
@@ -99,18 +99,17 @@
|
||||
</div>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
|
||||
<div class="form-group">
|
||||
<div class="col-lg-9 col-lg-offset-3">
|
||||
<button class="btn btn-default" type="submit" name="submitNewVoucher">
|
||||
<i class="icon-ok"></i>
|
||||
{l s='Add'}
|
||||
</button>
|
||||
|
||||
<button class="btn btn-default" type="button" id="cancel_add_voucher">
|
||||
<i class="icon-remove"></i>
|
||||
<i class="icon-remove text-danger"></i>
|
||||
{l s='Cancel'}
|
||||
</button>
|
||||
<button class="btn btn-default" type="submit" name="submitNewVoucher">
|
||||
<i class="icon-ok text-success"></i>
|
||||
{l s='Add'}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -123,8 +123,8 @@
|
||||
{if !isset($document->is_delivery)}
|
||||
{if $document->getRestPaid()}
|
||||
<a href="#" class="js-set-payment btn btn-default" data-amount="{$document->getRestPaid()}" data-id-invoice="{$document->id}" title="{l s='Set payment form'}">
|
||||
<i class="icon-pencil"></i>
|
||||
{l s='Set payment form'}
|
||||
<i class="icon-money"></i>
|
||||
{l s='Enter Payment'}
|
||||
</a>
|
||||
{/if}
|
||||
<a href="#" class="btn btn-default" onclick="$('#invoiceNote{$document->id}').show(); return false;" title="{if $document->note eq ''}{l s='Add note'}{else}{l s='Edit note'}{/if}">
|
||||
@@ -148,7 +148,7 @@
|
||||
<p>
|
||||
<label for="editNote{$document->id}" class="t">{l s='Note'}</label>
|
||||
<input type="hidden" name="id_order_invoice" value="{$document->id}" />
|
||||
<textarea name="note" rows="10" cols="10" id="editNote{$document->id}" class="edit-note">{$document->note|escape:'htmlall':'UTF-8'}</textarea>
|
||||
<textarea name="note" id="editNote{$document->id}" class="edit-note textarea-autosize">{$document->note|escape:'htmlall':'UTF-8'}</textarea>
|
||||
</p>
|
||||
<p>
|
||||
<button type="submit" name="submitEditNote" class="btn btn-default">
|
||||
|
||||
@@ -76,9 +76,13 @@
|
||||
{/if}
|
||||
</td>
|
||||
<td style="display:none;">
|
||||
<button type="button" class="btn btn-default" id="cancelAddProduct">
|
||||
<i class="icon-remove text-danger"></i>
|
||||
{l s='Cancel'}
|
||||
</button>
|
||||
<button type="button" class="btn btn-default" id="submitAddProduct" disabled="disabled">
|
||||
<i class="icon-ok"></i>
|
||||
{l s='Add product'}
|
||||
<i class="icon-ok text-success"></i>
|
||||
{l s='Add'}
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -134,26 +134,38 @@
|
||||
{/if}
|
||||
</td>
|
||||
<td class="partial_refund_fields current-edit" style="display:none;">
|
||||
<div>
|
||||
{l s='Quantity:'}
|
||||
|
||||
<div class="form-group">
|
||||
<label class="control-label">
|
||||
{l s='Quantity:'}
|
||||
</label>
|
||||
<div class="input-group">
|
||||
<input onchange="checkPartialRefundProductQuantity(this)" type="text" name="partialRefundProductQuantity[{{$product['id_order_detail']}}]" value="0" />
|
||||
<div class="input-group-addon">0/{$productQuantity-$product['product_quantity_refunded']}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<input onchange="checkPartialRefundProductQuantity(this)" type="text" name="partialRefundProductQuantity[{{$product['id_order_detail']}}]" value="0" />
|
||||
0/{$productQuantity-$product['product_quantity_refunded']}
|
||||
|
||||
<div class="form-group">
|
||||
<label class="control-label">
|
||||
{l s='Amount:'}
|
||||
</label>
|
||||
<div class="input-group">
|
||||
<div class="input-group-addon">
|
||||
{$currency->prefix}
|
||||
{$currency->suffix}
|
||||
</div>
|
||||
<input onchange="checkPartialRefundProductAmount(this)" type="text" name="partialRefundProduct[{$product['id_order_detail']}]" />
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
{l s='Amount:'}
|
||||
|
||||
<div class="form-group">
|
||||
{if !empty($product['amount_refund']) && $product['amount_refund'] > 0}
|
||||
({l s='%s refund' sprintf=$product['amount_refund']})
|
||||
{/if}
|
||||
<input type="hidden" value="{$product['quantity_refundable']}" class="partialRefundProductQuantity" />
|
||||
<input type="hidden" value="{$product['amount_refundable']}" class="partialRefundProductAmount" />
|
||||
</div>
|
||||
<div>
|
||||
{$currency->prefix}
|
||||
<input onchange="checkPartialRefundProductAmount(this)" type="text" name="partialRefundProduct[{$product['id_order_detail']}]" />
|
||||
{$currency->suffix}
|
||||
</div>
|
||||
{if !empty($product['amount_refund']) && $product['amount_refund'] > 0}
|
||||
({l s='%s refund' sprintf=$product['amount_refund']})
|
||||
{/if}
|
||||
<input type="hidden" value="{$product['quantity_refundable']}" class="partialRefundProductQuantity" />
|
||||
<input type="hidden" value="{$product['amount_refundable']}" class="partialRefundProductAmount" />
|
||||
|
||||
</td>
|
||||
{if ($can_edit && !$order->hasBeenDelivered())}
|
||||
<td class="product_invoice" colspan="2" style="display: none;">
|
||||
@@ -198,7 +210,6 @@
|
||||
{l s='Cancel'}
|
||||
</button>
|
||||
|
||||
|
||||
</td>
|
||||
{/if}
|
||||
</tr>
|
||||
|
||||
@@ -66,7 +66,10 @@
|
||||
<span class="shipping_number_edit" style="display:none;">
|
||||
<input type="hidden" name="id_order_carrier" value="{$line.id_order_carrier|htmlentities}" />
|
||||
<input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" />
|
||||
<input type="submit" class="btn btn-default" name="submitShippingNumber" value="{l s='Update'}" />
|
||||
<button type="submit" class="btn btn-default" name="submitShippingNumber">
|
||||
<i class="icon-ok"></i>
|
||||
{l s='Update'}
|
||||
</button>
|
||||
</span>
|
||||
<a href="#" class="edit_shipping_number_link btn btn-default">
|
||||
<i class="icon-pencil"></i>
|
||||
|
||||
@@ -119,7 +119,7 @@
|
||||
<tbody>
|
||||
{foreach from=$history item=row key=key}
|
||||
{if ($key == 0)}
|
||||
<tr class="highlight">
|
||||
<tr class="highlighted">
|
||||
<td><img src="../img/os/{$row['id_order_state']}.gif" /></td>
|
||||
<td><span class="title_box ">{$row['ostate_name']|stripslashes}</span></td>
|
||||
<td><span class="title_box ">{if $row['employee_lastname']}{$row['employee_firstname']|stripslashes} {$row['employee_lastname']|stripslashes}{/if}</span></td>
|
||||
@@ -332,7 +332,7 @@
|
||||
|
||||
|
||||
{if count($order->getOrderPayments()) > 0}
|
||||
<p class="alert alert-warning" style="{if round($orders_total_paid_tax_incl, 2) == round($total_paid, 2) || $currentState->id == 6}display: none;{/if}">
|
||||
<p class="alert alert-danger" style="{if round($orders_total_paid_tax_incl, 2) == round($total_paid, 2) || $currentState->id == 6}display: none;{/if}">
|
||||
{l s='Warning'}
|
||||
<strong>{displayPrice price=$total_paid currency=$currency->id}</strong>
|
||||
{l s='paid instead of'}
|
||||
@@ -764,7 +764,7 @@
|
||||
{/if}
|
||||
</th>
|
||||
<th style="display:none" class="partial_refund_fields">
|
||||
{l s='Partial refund'}
|
||||
<span class="title_box ">{l s='Partial refund'}</span>
|
||||
</th>
|
||||
{if !$order->hasBeenDelivered()}
|
||||
<th></th>
|
||||
@@ -788,10 +788,10 @@
|
||||
{if $can_edit}
|
||||
{if !$order->hasBeenDelivered()}
|
||||
<div class="row-margin-bottom">
|
||||
<a href="#" class="add_product btn btn-default">
|
||||
<button type="button" id="add_product" class="btn btn-default">
|
||||
<i class="icon-plus-sign"></i>
|
||||
{l s='Add a product'}
|
||||
</a>
|
||||
</button>
|
||||
</div>
|
||||
{/if}
|
||||
{/if}
|
||||
@@ -836,9 +836,13 @@
|
||||
{displayPrice price=$order->total_shipping_tax_incl currency=$currency->id}
|
||||
</td>
|
||||
<td class="partial_refund_fields current-edit" style="display:none;">
|
||||
{$currency->prefix}
|
||||
<input type="text" name="partialRefundShippingCost" value="0" />
|
||||
{$currency->suffix}
|
||||
<div class="input-group">
|
||||
<div class="input-group-addon">
|
||||
{$currency->prefix}
|
||||
{$currency->suffix}
|
||||
</div>
|
||||
<input type="text" name="partialRefundShippingCost" value="0" />
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr id="total_order">
|
||||
@@ -851,6 +855,59 @@
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div style="display: none;" class="standard_refund_fields form-horizontal">
|
||||
{if ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN'))}
|
||||
<p class="checkbox">
|
||||
<label for="reinjectQuantities">
|
||||
<input type="checkbox" name="reinjectQuantities"/>
|
||||
{l s='Re-stock products'}
|
||||
</label>
|
||||
</p>
|
||||
{/if}
|
||||
|
||||
{if ((!$order->hasBeenDelivered() && $order->hasBeenPaid()) || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))}
|
||||
<p class="checkbox">
|
||||
<label for="generateCreditSlip">
|
||||
<input type="checkbox" id="generateCreditSlip" name="generateCreditSlip" onclick="toggleShippingCost(this)" />
|
||||
{l s='Generate a credit card slip'}
|
||||
</label>
|
||||
</p>
|
||||
<p class="checkbox">
|
||||
<label for="generateDiscount">
|
||||
<input type="checkbox" id="generateDiscount" name="generateDiscount" onclick="toggleShippingCost(this)" />
|
||||
{l s='Generate a voucher'}
|
||||
</label>
|
||||
</p>
|
||||
<p class="checkbox" id="spanShippingBack" style="display:none;">
|
||||
<label for="shippingBack" style="float:none">
|
||||
<input type="checkbox" id="shippingBack" name="shippingBack" />
|
||||
{l s='Repay shipping costs'}
|
||||
</label>
|
||||
</p>
|
||||
{/if}
|
||||
|
||||
{if (!$order->hasBeenDelivered() || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))}
|
||||
<input type="submit" name="cancelProduct" value="{if $order->hasBeenDelivered()}{l s='Return products'}{elseif $order->hasBeenPaid()}{l s='Refund products'}{else}{l s='Cancel products'}{/if}" class="btn btn-default" />
|
||||
{/if}
|
||||
</div>
|
||||
<div style="display:none;" class="partial_refund_fields">
|
||||
<p class="checkbox">
|
||||
<label for="reinjectQuantities">
|
||||
<input type="checkbox" id="reinjectQuantities" name="reinjectQuantities" />
|
||||
{l s='Re-stock products'}
|
||||
</label>
|
||||
</p>
|
||||
<p class="checkbox">
|
||||
<label for="generateDiscountRefund">
|
||||
<input type="checkbox" id="generateDiscountRefund" name="generateDiscountRefund" onclick="toggleShippingCost(this)" />
|
||||
{l s='Generate a voucher'}
|
||||
</label>
|
||||
</p>
|
||||
<button type="submit" name="partialRefund" class="btn btn-default" />
|
||||
<i class="icon-ok"></i>
|
||||
{l s='Partial refund'}
|
||||
</button>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
<fieldset >
|
||||
@@ -872,7 +929,9 @@
|
||||
{l s='Value'}
|
||||
</span>
|
||||
</th>
|
||||
{if $can_edit}<th></th>{/if}
|
||||
{if $can_edit}
|
||||
<th></th>
|
||||
{/if}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -908,35 +967,6 @@
|
||||
{/if}
|
||||
{/if}
|
||||
|
||||
<div style="display: none;" class="standard_refund_fields">
|
||||
{if ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN'))}
|
||||
<input type="checkbox" name="reinjectQuantities"/>
|
||||
<label for="reinjectQuantities">{l s='Re-stock products'}</label>
|
||||
{/if}
|
||||
|
||||
{if ((!$order->hasBeenDelivered() && $order->hasBeenPaid()) || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))}
|
||||
<input type="checkbox" id="generateCreditSlip" name="generateCreditSlip" onclick="toggleShippingCost(this)" />
|
||||
<label for="generateCreditSlip">{l s='Generate a credit card slip'}</label>
|
||||
<input type="checkbox" id="generateDiscount" name="generateDiscount" onclick="toggleShippingCost(this)" />
|
||||
<label for="generateDiscount">{l s='Generate a voucher'}</label>
|
||||
|
||||
<span id="spanShippingBack" style="display:none;">
|
||||
<input type="checkbox" id="shippingBack" name="shippingBack" class="btn btn-default" />
|
||||
<label for="shippingBack" style="float:none; font-weight:normal;">{l s='Repay shipping costs'}</label>
|
||||
</span>
|
||||
{/if}
|
||||
|
||||
{if (!$order->hasBeenDelivered() || ($order->hasBeenDelivered() && Configuration::get('PS_ORDER_RETURN')))}
|
||||
<input type="submit" name="cancelProduct" value="{if $order->hasBeenDelivered()}{l s='Return products'}{elseif $order->hasBeenPaid()}{l s='Refund products'}{else}{l s='Cancel products'}{/if}" class="btn btn-default" />
|
||||
{/if}
|
||||
</div>
|
||||
<div style="display:none;" class="partial_refund_fields">
|
||||
<input type="checkbox" name="reinjectQuantities" class="btn btn-default" />
|
||||
<label for="reinjectQuantities">{l s='Re-stock products'}</label>
|
||||
<input type="checkbox" id="generateDiscountRefund" name="generateDiscountRefund" class="btn btn-default" onclick="toggleShippingCost(this)" />
|
||||
<label for="generateDiscount">{l s='Generate a voucher'}</label>
|
||||
<input type="submit" name="partialRefund" value="{l s='Partial refund'}" class="btn btn-default" />
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
|
||||
@@ -946,36 +976,79 @@
|
||||
<i class="icon-envelope"></i>
|
||||
{l s='New message'}
|
||||
</h3>
|
||||
<button type="button" class="btn btn-default" onclick="$('#message').slideToggle();$('#message_m').slideToggle();return false">
|
||||
|
||||
<p id="message_m" style="display: {if Tools::getValue('message')}none{else}block{/if}">
|
||||
{l s='to add a comment or send a message to the customer.'}
|
||||
</p>
|
||||
|
||||
<button id="newMessage" type="button" class="btn btn-default">
|
||||
<i class="icon-envelope"></i>
|
||||
{l s='New message'}
|
||||
</button>
|
||||
<div id="message_m" style="display: {if Tools::getValue('message')}none{else}block{/if}">
|
||||
|
||||
{l s='to add a comment or send a message to the customer.'}
|
||||
<div id="message" class="form-horizontal" style="display:none">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-lg-3">{l s='Choose a standard message'}</label>
|
||||
<div class="col-lg-9">
|
||||
<select name="order_message" id="order_message" onchange="orderOverwriteMessage(this, '{l s='Do you want to overwrite your existing message?'}')">
|
||||
<option value="0" selected="selected">--</option>
|
||||
{foreach from=$orderMessages item=orderMessage}
|
||||
<option value="{$orderMessage['message']|escape:'htmlall':'UTF-8'}">{$orderMessage['name']}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="control-label col-lg-3">{l s='Display to customer?'}</label>
|
||||
<div class="col-lg-9">
|
||||
<div class="row">
|
||||
<div class="input-group col-lg-2">
|
||||
<span class="switch prestashop-switch">
|
||||
<input type="radio" name="visibility" id="visibility_on" value="0" />
|
||||
<label class="radio" for="visibility_on">
|
||||
<i class="icon-check-sign text-success"></i>
|
||||
{l s='Yes'}
|
||||
</label>
|
||||
<input type="radio" name="visibility" id="visibility_off" value="1" checked="checked" />
|
||||
<label class="radio" for="visibility_off">
|
||||
<i class="icon-ban-circle text-danger"></i>
|
||||
{l s='No'}
|
||||
</label>
|
||||
<span class="slide-button btn btn-default"></span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="control-label col-lg-3">{l s='Message'}</label>
|
||||
<div class="col-lg-9">
|
||||
<textarea id="txt_msg" class="textarea-autosize" name="message">{Tools::getValue('message')|escape:'htmlall':'UTF-8'}</textarea>
|
||||
<p id="nbchars"></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="col-lg-9 col-lg-offset-3">
|
||||
<input type="hidden" name="id_order" value="{$order->id}" />
|
||||
<input type="hidden" name="id_customer" value="{$order->id_customer}" />
|
||||
<button type="button" id="cancelMessage" class="btn btn-default">
|
||||
<i class="icon-remove text-danger"></i>
|
||||
{l s='Cancel'}
|
||||
</button>
|
||||
<button type="submit" id="submitMessage" class="btn btn-default" >
|
||||
<i class="icon-ok text-success"></i>
|
||||
{l s='Send'}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<hr/>
|
||||
<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}">
|
||||
<b>{l s='Click here'}</b> {l s='to see all messages.'}
|
||||
<i class="icon-external-link"></i>
|
||||
</a>
|
||||
<div id="message" style="display: {if Tools::getValue('message')}block{else}none{/if}">
|
||||
<select name="order_message" id="order_message" onchange="orderOverwriteMessage(this, '{l s='Do you want to overwrite your existing message?'}')">
|
||||
<option value="0" selected="selected">-- {l s='Choose a standard message'} --</option>
|
||||
{foreach from=$orderMessages item=orderMessage}
|
||||
<option value="{$orderMessage['message']|escape:'htmlall':'UTF-8'}">{$orderMessage['name']}</option>
|
||||
{/foreach}
|
||||
</select>
|
||||
<b>{l s='Display to customer?'}</b>
|
||||
<input type="radio" name="visibility" id="visibility" value="0" /> {l s='Yes'}
|
||||
<input type="radio" name="visibility" value="1" checked="checked" /> {l s='No'}
|
||||
|
||||
<p id="nbchars"></p>
|
||||
|
||||
<textarea id="txt_msg" name="message" cols="50" rows="8" onKeyUp="var length = document.getElementById('txt_msg').value.length; if (length > 600) length = '600+'; document.getElementById('nbchars').innerHTML = '{l s='600 characters, max.'} (' + length + ')';">{Tools::getValue('message')|escape:'htmlall':'UTF-8'}</textarea>
|
||||
|
||||
<input type="hidden" name="id_order" value="{$order->id}" />
|
||||
<input type="hidden" name="id_customer" value="{$order->id_customer}" />
|
||||
<input type="submit" class="btn btn-default" name="submitMessage" value="{l s='Send'}" />
|
||||
</div>
|
||||
</fieldset>
|
||||
</form>
|
||||
|
||||
@@ -989,7 +1062,7 @@
|
||||
<div {if $message['is_new_for_me']}class="new_message"{/if}>
|
||||
{if ($message['is_new_for_me'])}
|
||||
<a class="new_message" title="{l s='Mark this message as \'viewed\''}" href="{$smarty.server.REQUEST_URI}&token={$smarty.get.token}&messageReaded={$message['id_message']}">
|
||||
<img src="../img/admin/enabled.gif" alt="" />
|
||||
<i class="icon-ok"></i>
|
||||
</a>
|
||||
{/if}
|
||||
{l s='At'} <i>{dateFormat date=$message['date_add']}</i>
|
||||
@@ -1003,4 +1076,8 @@
|
||||
</fieldset>
|
||||
{/if}
|
||||
|
||||
<script type="text/javascript">
|
||||
$(".textarea-autosize").autosize();
|
||||
</script>
|
||||
|
||||
{/block}
|
||||
Reference in New Issue
Block a user