Language display optimized

Language is now no longer direct array access but provided through a
function. This can be later used to hot load language files instead of
pre-loading them.
This commit is contained in:
Dennis Eichhorn 2016-07-02 14:14:31 +02:00
parent 264fba4c0e
commit d83dbcd5e1
4 changed files with 108 additions and 108 deletions

View File

@ -22,64 +22,64 @@ echo $this->getData('nav')->render(); ?>
<div class="tabular-2"> <div class="tabular-2">
<div class="box"> <div class="box">
<ul class="tab-links"> <ul class="tab-links">
<li><label for="c-tab-1"><?= $this->l11n->lang['Billing']['Invoice'] ?></label></li> <li><label for="c-tab-1"><?= $this->l11n->getText('Billing', 'Invoice') ?></label></li>
<li><label for="c-tab-2"><?= $this->l11n->lang['Billing']['Items'] ?></label></li> <li><label for="c-tab-2"><?= $this->l11n->getText('Billing', 'Items') ?></label></li>
</ul> </ul>
</div> </div>
<div class="tab-content"> <div class="tab-content">
<input type="radio" id="c-tab-1" name="tabular-2" checked> <input type="radio" id="c-tab-1" name="tabular-2" checked>
<div class="tab"> <div class="tab">
<section class="box w-50 floatLeft"> <section class="box w-50 floatLeft">
<header><h1><?= $this->l11n->lang['Billing']['Invoice'] ?></h1></header> <header><h1><?= $this->l11n->getText('Billing', 'Invoice') ?></h1></header>
<div class="inner"> <div class="inner">
<form> <form>
<table class="layout wf-100"> <table class="layout wf-100">
<tr><td><label for="iSource"><?= $this->l11n->lang['Billing']['Source'] ?></label> <tr><td><label for="iSource"><?= $this->l11n->getText('Billing', 'Source') ?></label>
<tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" id="iSource" name="source"></span> <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" id="iSource" name="source"></span>
<tr><td><label for="iType"><?= $this->l11n->lang['Billing']['Type'] ?></label> <tr><td><label for="iType"><?= $this->l11n->getText('Billing', 'Type') ?></label>
<tr><td><select id="iType" name="type"> <tr><td><select id="iType" name="type">
<option><?= $this->l11n->lang['Billing']['Invoice'] ?> <option><?= $this->l11n->getText('Billing', 'Invoice') ?>
<option><?= $this->l11n->lang['Billing']['Offer'] ?> <option><?= $this->l11n->getText('Billing', 'Offer') ?>
<option><?= $this->l11n->lang['Billing']['Confirmation'] ?> <option><?= $this->l11n->getText('Billing', 'Confirmation') ?>
<option><?= $this->l11n->lang['Billing']['DeliveryNote'] ?> <option><?= $this->l11n->getText('Billing', 'DeliveryNote') ?>
<option><?= $this->l11n->lang['Billing']['CreditNote'] ?> <option><?= $this->l11n->getText('Billing', 'CreditNote') ?>
</select> </select>
<tr><td><label for="iClient"><?= $this->l11n->lang['Billing']['Client'] ?></label> <tr><td><label for="iClient"><?= $this->l11n->getText('Billing', 'Client') ?></label>
<tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" id="iClient" name="client"></span> <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" id="iClient" name="client"></span>
<tr><td><label for="iDelivery"><?= $this->l11n->lang['Billing']['Delivery'] ?></label> <tr><td><label for="iDelivery"><?= $this->l11n->getText('Billing', 'Delivery') ?></label>
<tr><td><input type="datetime-local" id="iDelivery" name="delivery"> <tr><td><input type="datetime-local" id="iDelivery" name="delivery">
<tr><td><label for="iDue"><?= $this->l11n->lang['Billing']['Due'] ?></label> <tr><td><label for="iDue"><?= $this->l11n->getText('Billing', 'Due') ?></label>
<tr><td><input type="datetime-local" id="iDue" name="due"> <tr><td><input type="datetime-local" id="iDue" name="due">
<tr><td><label for="iFreightage"><?= $this->l11n->lang['Billing']['Freightage'] ?></label> <tr><td><label for="iFreightage"><?= $this->l11n->getText('Billing', 'Freightage') ?></label>
<tr><td><input type="number" id="iFreightage" name="freightage"> <tr><td><input type="number" id="iFreightage" name="freightage">
<tr><td><label for="iShipment"><?= $this->l11n->lang['Billing']['Shipment'] ?></label> <tr><td><label for="iShipment"><?= $this->l11n->getText('Billing', 'Shipment') ?></label>
<tr><td><select id="iShipment" name="shipment"> <tr><td><select id="iShipment" name="shipment">
<option> <option>
</select> </select>
<tr><td colspan="3"><input type="submit" value="<?= $this->l11n->lang[0]['Create'] ?>"> <tr><td colspan="3"><input type="submit" value="<?= $this->l11n->getText(0, 'Create') ?>">
</table> </table>
</form> </form>
</div> </div>
</section> </section>
<section class="box w-50 floatLeft"> <section class="box w-50 floatLeft">
<header><h1><?= $this->l11n->lang['Billing']['Invoice'] ?></h1></header> <header><h1><?= $this->l11n->getText('Billing', 'Invoice') ?></h1></header>
<div class="inner"> <div class="inner">
<form> <form>
<table class="layout wf-100"> <table class="layout wf-100">
<tr><td><label for="iAddressS"><?= $this->l11n->lang['Billing']['Addresses'] ?></label> <tr><td><label for="iAddressS"><?= $this->l11n->getText('Billing', 'Addresses') ?></label>
<tr><td><select id="iAddressS" name="addressS"> <tr><td><select id="iAddressS" name="addressS">
<option> <option>
</select> </select>
<tr><td><label for="iIRecipient"><?= $this->l11n->lang['Billing']['Recipient'] ?></label> <tr><td><label for="iIRecipient"><?= $this->l11n->getText('Billing', 'Recipient') ?></label>
<tr><td><input type="text" id="iIRecipient" name="irecipient"> <tr><td><input type="text" id="iIRecipient" name="irecipient">
<tr><td><label for="iAddress"><?= $this->l11n->lang['Billing']['Address'] ?></label> <tr><td><label for="iAddress"><?= $this->l11n->getText('Billing', 'Address') ?></label>
<tr><td><input type="text" id="iAddress" name="address"> <tr><td><input type="text" id="iAddress" name="address">
<tr><td><label for="iZip"><?= $this->l11n->lang['Billing']['Zip'] ?></label> <tr><td><label for="iZip"><?= $this->l11n->getText('Billing', 'Zip') ?></label>
<tr><td><input type="text" id="iZip" name="zip"> <tr><td><input type="text" id="iZip" name="zip">
<tr><td><label for="iCity"><?= $this->l11n->lang['Billing']['City'] ?></label> <tr><td><label for="iCity"><?= $this->l11n->getText('Billing', 'City') ?></label>
<tr><td><input type="text" id="iCity" name="city"> <tr><td><input type="text" id="iCity" name="city">
<tr><td><label for="iCountry"><?= $this->l11n->lang['Billing']['Country'] ?></label> <tr><td><label for="iCountry"><?= $this->l11n->getText('Billing', 'Country') ?></label>
<tr><td><input type="text" id="iCountry" name="country"> <tr><td><input type="text" id="iCountry" name="country">
</table> </table>
</form> </form>
@ -87,23 +87,23 @@ echo $this->getData('nav')->render(); ?>
</section> </section>
<section class="box w-50 floatLeft"> <section class="box w-50 floatLeft">
<header><h1><?= $this->l11n->lang['Billing']['Delivery'] ?></h1></header> <header><h1><?= $this->l11n->getText('Billing', 'Delivery') ?></h1></header>
<div class="inner"> <div class="inner">
<form> <form>
<table class="layout wf-100"> <table class="layout wf-100">
<tr><td><label for="iAddressS"><?= $this->l11n->lang['Billing']['Addresses'] ?></label> <tr><td><label for="iAddressS"><?= $this->l11n->getText('Billing', 'Addresses') ?></label>
<tr><td><select id="iAddressS" name="addressS"> <tr><td><select id="iAddressS" name="addressS">
<option> <option>
</select> </select>
<tr><td><label for="iDRecipient"><?= $this->l11n->lang['Billing']['Recipient'] ?></label> <tr><td><label for="iDRecipient"><?= $this->l11n->getText('Billing', 'Recipient') ?></label>
<tr><td><input type="text" id="iDRecipient" name="drecipient"> <tr><td><input type="text" id="iDRecipient" name="drecipient">
<tr><td><label for="iAddress"><?= $this->l11n->lang['Billing']['Address'] ?></label> <tr><td><label for="iAddress"><?= $this->l11n->getText('Billing', 'Address') ?></label>
<tr><td><input type="text" id="iAddress" name="address"> <tr><td><input type="text" id="iAddress" name="address">
<tr><td><label for="iZip"><?= $this->l11n->lang['Billing']['Zip'] ?></label> <tr><td><label for="iZip"><?= $this->l11n->getText('Billing', 'Zip') ?></label>
<tr><td><input type="text" id="iZip" name="zip"> <tr><td><input type="text" id="iZip" name="zip">
<tr><td><label for="iCity"><?= $this->l11n->lang['Billing']['City'] ?></label> <tr><td><label for="iCity"><?= $this->l11n->getText('Billing', 'City') ?></label>
<tr><td><input type="text" id="iCity" name="city"> <tr><td><input type="text" id="iCity" name="city">
<tr><td><label for="iCountry"><?= $this->l11n->lang['Billing']['Country'] ?></label> <tr><td><label for="iCountry"><?= $this->l11n->getText('Billing', 'Country') ?></label>
<tr><td><input type="text" id="iCountry" name="country"> <tr><td><input type="text" id="iCountry" name="country">
</table> </table>
</form> </form>
@ -114,26 +114,26 @@ echo $this->getData('nav')->render(); ?>
<div class="tab"> <div class="tab">
<div class="box w-100"> <div class="box w-100">
<table class="table"> <table class="table">
<caption><?= $this->l11n->lang['Billing']['Invoice'] ?></caption> <caption><?= $this->l11n->getText('Billing', 'Invoice') ?></caption>
<thead> <thead>
<tr> <tr>
<td> <td>
<td><?= $this->l11n->lang['Billing']['Item']; ?> <td><?= $this->l11n->getText('Billing', 'Item'); ?>
<td><?= $this->l11n->lang['Billing']['Variation']; ?> <td><?= $this->l11n->getText('Billing', 'Variation'); ?>
<td class="wf-100"><?= $this->l11n->lang['Billing']['Name']; ?> <td class="wf-100"><?= $this->l11n->getText('Billing', 'Name'); ?>
<td><?= $this->l11n->lang['Billing']['Quantity']; ?> <td><?= $this->l11n->getText('Billing', 'Quantity'); ?>
<td><?= $this->l11n->lang['Billing']['Discount']; ?> <td><?= $this->l11n->getText('Billing', 'Discount'); ?>
<td><?= $this->l11n->lang['Billing']['DiscountP']; ?> <td><?= $this->l11n->getText('Billing', 'DiscountP'); ?>
<td><?= $this->l11n->lang['Billing']['Bonus']; ?> <td><?= $this->l11n->getText('Billing', 'Bonus'); ?>
<td><?= $this->l11n->lang['Billing']['Tax']; ?> <td><?= $this->l11n->getText('Billing', 'Tax'); ?>
<td><?= $this->l11n->lang['Billing']['Net']; ?> <td><?= $this->l11n->getText('Billing', 'Net'); ?>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="8"><!-- todo: make this look nicer. even as alpha release this looks bad. --> <td colspan="8"><!-- todo: make this look nicer. even as alpha release this looks bad. -->
<?= $this->l11n->lang['Billing']['Freightage']; ?>: 0.00 - <?= $this->l11n->getText('Billing', 'Freightage'); ?>: 0.00 -
<?= $this->l11n->lang['Billing']['Net']; ?>: 0.00 - <?= $this->l11n->getText('Billing', 'Net'); ?>: 0.00 -
<?= $this->l11n->lang['Billing']['Tax']; ?>: 0.00 - <?= $this->l11n->getText('Billing', 'Tax'); ?>: 0.00 -
<?= $this->l11n->lang['Billing']['Total']; ?>: 0.00 <?= $this->l11n->getText('Billing', 'Total'); ?>: 0.00
<tbody> <tbody>
<tr> <tr>
<td><i class="fa fa-plus"></i> <i class="fa fa-chevron-up"></i> <i class="fa fa-chevron-down"></i> <td><i class="fa fa-plus"></i> <i class="fa fa-chevron-up"></i> <i class="fa fa-chevron-down"></i>

View File

@ -23,17 +23,17 @@ echo $this->getData('nav')->render(); ?>
<div class="box w-100"> <div class="box w-100">
<table class="table"> <table class="table">
<caption><?= $this->l11n->lang['Billing']['Invoices'] ?></caption> <caption><?= $this->l11n->getText('Billing', 'Invoices') ?></caption>
<thead> <thead>
<tr> <tr>
<td><?= $this->l11n->lang[0]['ID']; ?> <td><?= $this->l11n->getText(0, 'ID'); ?>
<td><?= $this->l11n->lang['Billing']['Type']; ?> <td><?= $this->l11n->getText('Billing', 'Type'); ?>
<td><?= $this->l11n->lang['Billing']['ClientID']; ?> <td><?= $this->l11n->getText('Billing', 'ClientID'); ?>
<td class="wf-100"><?= $this->l11n->lang['Billing']['Client']; ?> <td class="wf-100"><?= $this->l11n->getText('Billing', 'Client'); ?>
<td><?= $this->l11n->lang['Billing']['Net']; ?> <td><?= $this->l11n->getText('Billing', 'Net'); ?>
<td><?= $this->l11n->lang['Billing']['Gross']; ?> <td><?= $this->l11n->getText('Billing', 'Gross'); ?>
<td><?= $this->l11n->lang['Billing']['Created']; ?> <td><?= $this->l11n->getText('Billing', 'Created'); ?>
<td><?= $this->l11n->lang['Billing']['Due']; ?> <td><?= $this->l11n->getText('Billing', 'Due'); ?>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="8"><?= $footerView->render(); ?> <td colspan="8"><?= $footerView->render(); ?>
@ -41,7 +41,7 @@ echo $this->getData('nav')->render(); ?>
<?php $count = 0; foreach([] as $key => $value) : $count++; ?> <?php $count = 0; foreach([] as $key => $value) : $count++; ?>
<?php endforeach; ?> <?php endforeach; ?>
<?php if($count === 0) : ?> <?php if($count === 0) : ?>
<tr><td colspan="8" class="empty"><?= $this->l11n->lang[0]['Empty']; ?> <tr><td colspan="8" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
<?php endif; ?> <?php endif; ?>
</table> </table>
</div> </div>

View File

@ -23,17 +23,17 @@ echo $this->getData('nav')->render(); ?>
<div class="box w-100"> <div class="box w-100">
<table class="table"> <table class="table">
<caption><?= $this->l11n->lang['Billing']['Invoices'] ?></caption> <caption><?= $this->l11n->getText('Billing', 'Invoices') ?></caption>
<thead> <thead>
<tr> <tr>
<td><?= $this->l11n->lang[0]['ID']; ?> <td><?= $this->l11n->getText(0, 'ID'); ?>
<td><?= $this->l11n->lang['Billing']['Type']; ?> <td><?= $this->l11n->getText('Billing', 'Type'); ?>
<td><?= $this->l11n->lang['Billing']['SupplierID']; ?> <td><?= $this->l11n->getText('Billing', 'SupplierID'); ?>
<td class="wf-100"><?= $this->l11n->lang['Billing']['Supplier']; ?> <td class="wf-100"><?= $this->l11n->getText('Billing', 'Supplier'); ?>
<td><?= $this->l11n->lang['Billing']['Net']; ?> <td><?= $this->l11n->getText('Billing', 'Net'); ?>
<td><?= $this->l11n->lang['Billing']['Gross']; ?> <td><?= $this->l11n->getText('Billing', 'Gross'); ?>
<td><?= $this->l11n->lang['Billing']['Created']; ?> <td><?= $this->l11n->getText('Billing', 'Created'); ?>
<td><?= $this->l11n->lang['Billing']['Due']; ?> <td><?= $this->l11n->getText('Billing', 'Due'); ?>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="8"><?= $footerView->render(); ?> <td colspan="8"><?= $footerView->render(); ?>
@ -41,7 +41,7 @@ echo $this->getData('nav')->render(); ?>
<?php $count = 0; foreach([] as $key => $value) : $count++; ?> <?php $count = 0; foreach([] as $key => $value) : $count++; ?>
<?php endforeach; ?> <?php endforeach; ?>
<?php if($count === 0) : ?> <?php if($count === 0) : ?>
<tr><td colspan="8" class="empty"><?= $this->l11n->lang[0]['Empty']; ?> <tr><td colspan="8" class="empty"><?= $this->l11n->getText(0, 'Empty'); ?>
<?php endif; ?> <?php endif; ?>
</table> </table>
</div> </div>

View File

@ -22,64 +22,64 @@ echo $this->getData('nav')->render(); ?>
<div class="tabular-2"> <div class="tabular-2">
<div class="box"> <div class="box">
<ul class="tab-links"> <ul class="tab-links">
<li><label for="c-tab-1"><?= $this->l11n->lang['Billing']['Invoice'] ?></label></li> <li><label for="c-tab-1"><?= $this->l11n->getText('Billing', 'Invoice') ?></label></li>
<li><label for="c-tab-2"><?= $this->l11n->lang['Billing']['Items'] ?></label></li> <li><label for="c-tab-2"><?= $this->l11n->getText('Billing', 'Items') ?></label></li>
</ul> </ul>
</div> </div>
<div class="tab-content"> <div class="tab-content">
<input type="radio" id="c-tab-1" name="tabular-2" checked> <input type="radio" id="c-tab-1" name="tabular-2" checked>
<div class="tab"> <div class="tab">
<section class="box w-50 floatLeft"> <section class="box w-50 floatLeft">
<header><h1><?= $this->l11n->lang['Billing']['Invoice'] ?></h1></header> <header><h1><?= $this->l11n->getText('Billing', 'Invoice') ?></h1></header>
<div class="inner"> <div class="inner">
<form> <form>
<table class="layout wf-100"> <table class="layout wf-100">
<tr><td><label for="iSource"><?= $this->l11n->lang['Billing']['Source'] ?></label> <tr><td><label for="iSource"><?= $this->l11n->getText('Billing', 'Source') ?></label>
<tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" id="iSource" name="source"></span> <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" id="iSource" name="source"></span>
<tr><td><label for="iType"><?= $this->l11n->lang['Billing']['Type'] ?></label> <tr><td><label for="iType"><?= $this->l11n->getText('Billing', 'Type') ?></label>
<tr><td><select id="iType" name="type"> <tr><td><select id="iType" name="type">
<option><?= $this->l11n->lang['Billing']['Invoice'] ?> <option><?= $this->l11n->getText('Billing', 'Invoice') ?>
<option><?= $this->l11n->lang['Billing']['Offer'] ?> <option><?= $this->l11n->getText('Billing', 'Offer') ?>
<option><?= $this->l11n->lang['Billing']['Confirmation'] ?> <option><?= $this->l11n->getText('Billing', 'Confirmation') ?>
<option><?= $this->l11n->lang['Billing']['DeliveryNote'] ?> <option><?= $this->l11n->getText('Billing', 'DeliveryNote') ?>
<option><?= $this->l11n->lang['Billing']['CreditNote'] ?> <option><?= $this->l11n->getText('Billing', 'CreditNote') ?>
</select> </select>
<tr><td><label for="iClient"><?= $this->l11n->lang['Billing']['Client'] ?></label> <tr><td><label for="iClient"><?= $this->l11n->getText('Billing', 'Client') ?></label>
<tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" id="iClient" name="client"></span> <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" id="iClient" name="client"></span>
<tr><td><label for="iDelivery"><?= $this->l11n->lang['Billing']['Delivery'] ?></label> <tr><td><label for="iDelivery"><?= $this->l11n->getText('Billing', 'Delivery') ?></label>
<tr><td><input type="datetime-local" id="iDelivery" name="delivery"> <tr><td><input type="datetime-local" id="iDelivery" name="delivery">
<tr><td><label for="iDue"><?= $this->l11n->lang['Billing']['Due'] ?></label> <tr><td><label for="iDue"><?= $this->l11n->getText('Billing', 'Due') ?></label>
<tr><td><input type="datetime-local" id="iDue" name="due"> <tr><td><input type="datetime-local" id="iDue" name="due">
<tr><td><label for="iFreightage"><?= $this->l11n->lang['Billing']['Freightage'] ?></label> <tr><td><label for="iFreightage"><?= $this->l11n->getText('Billing', 'Freightage') ?></label>
<tr><td><input type="number" id="iFreightage" name="freightage"> <tr><td><input type="number" id="iFreightage" name="freightage">
<tr><td><label for="iShipment"><?= $this->l11n->lang['Billing']['Shipment'] ?></label> <tr><td><label for="iShipment"><?= $this->l11n->getText('Billing', 'Shipment') ?></label>
<tr><td><select id="iShipment" name="shipment"> <tr><td><select id="iShipment" name="shipment">
<option> <option>
</select> </select>
<tr><td colspan="3"><input type="submit" value="<?= $this->l11n->lang[0]['Create'] ?>"> <tr><td colspan="3"><input type="submit" value="<?= $this->l11n->getText(0, 'Create') ?>">
</table> </table>
</form> </form>
</div> </div>
</section> </section>
<section class="box w-50 floatLeft"> <section class="box w-50 floatLeft">
<header><h1><?= $this->l11n->lang['Billing']['Invoice'] ?></h1></header> <header><h1><?= $this->l11n->getText('Billing', 'Invoice') ?></h1></header>
<div class="inner"> <div class="inner">
<form> <form>
<table class="layout wf-100"> <table class="layout wf-100">
<tr><td><label for="iAddressS"><?= $this->l11n->lang['Billing']['Addresses'] ?></label> <tr><td><label for="iAddressS"><?= $this->l11n->getText('Billing', 'Addresses') ?></label>
<tr><td><select id="iAddressS" name="addressS"> <tr><td><select id="iAddressS" name="addressS">
<option> <option>
</select> </select>
<tr><td><label for="iIRecipient"><?= $this->l11n->lang['Billing']['Recipient'] ?></label> <tr><td><label for="iIRecipient"><?= $this->l11n->getText('Billing', 'Recipient') ?></label>
<tr><td><input type="text" id="iIRecipient" name="irecipient"> <tr><td><input type="text" id="iIRecipient" name="irecipient">
<tr><td><label for="iAddress"><?= $this->l11n->lang['Billing']['Address'] ?></label> <tr><td><label for="iAddress"><?= $this->l11n->getText('Billing', 'Address') ?></label>
<tr><td><input type="text" id="iAddress" name="address"> <tr><td><input type="text" id="iAddress" name="address">
<tr><td><label for="iZip"><?= $this->l11n->lang['Billing']['Zip'] ?></label> <tr><td><label for="iZip"><?= $this->l11n->getText('Billing', 'Zip') ?></label>
<tr><td><input type="text" id="iZip" name="zip"> <tr><td><input type="text" id="iZip" name="zip">
<tr><td><label for="iCity"><?= $this->l11n->lang['Billing']['City'] ?></label> <tr><td><label for="iCity"><?= $this->l11n->getText('Billing', 'City') ?></label>
<tr><td><input type="text" id="iCity" name="city"> <tr><td><input type="text" id="iCity" name="city">
<tr><td><label for="iCountry"><?= $this->l11n->lang['Billing']['Country'] ?></label> <tr><td><label for="iCountry"><?= $this->l11n->getText('Billing', 'Country') ?></label>
<tr><td><input type="text" id="iCountry" name="country"> <tr><td><input type="text" id="iCountry" name="country">
</table> </table>
</form> </form>
@ -87,23 +87,23 @@ echo $this->getData('nav')->render(); ?>
</section> </section>
<section class="box w-50 floatLeft"> <section class="box w-50 floatLeft">
<header><h1><?= $this->l11n->lang['Billing']['Delivery'] ?></h1></header> <header><h1><?= $this->l11n->getText('Billing', 'Delivery') ?></h1></header>
<div class="inner"> <div class="inner">
<form> <form>
<table class="layout wf-100"> <table class="layout wf-100">
<tr><td><label for="iAddressS"><?= $this->l11n->lang['Billing']['Addresses'] ?></label> <tr><td><label for="iAddressS"><?= $this->l11n->getText('Billing', 'Addresses') ?></label>
<tr><td><select id="iAddressS" name="addressS"> <tr><td><select id="iAddressS" name="addressS">
<option> <option>
</select> </select>
<tr><td><label for="iDRecipient"><?= $this->l11n->lang['Billing']['Recipient'] ?></label> <tr><td><label for="iDRecipient"><?= $this->l11n->getText('Billing', 'Recipient') ?></label>
<tr><td><input type="text" id="iDRecipient" name="drecipient"> <tr><td><input type="text" id="iDRecipient" name="drecipient">
<tr><td><label for="iAddress"><?= $this->l11n->lang['Billing']['Address'] ?></label> <tr><td><label for="iAddress"><?= $this->l11n->getText('Billing', 'Address') ?></label>
<tr><td><input type="text" id="iAddress" name="address"> <tr><td><input type="text" id="iAddress" name="address">
<tr><td><label for="iZip"><?= $this->l11n->lang['Billing']['Zip'] ?></label> <tr><td><label for="iZip"><?= $this->l11n->getText('Billing', 'Zip') ?></label>
<tr><td><input type="text" id="iZip" name="zip"> <tr><td><input type="text" id="iZip" name="zip">
<tr><td><label for="iCity"><?= $this->l11n->lang['Billing']['City'] ?></label> <tr><td><label for="iCity"><?= $this->l11n->getText('Billing', 'City') ?></label>
<tr><td><input type="text" id="iCity" name="city"> <tr><td><input type="text" id="iCity" name="city">
<tr><td><label for="iCountry"><?= $this->l11n->lang['Billing']['Country'] ?></label> <tr><td><label for="iCountry"><?= $this->l11n->getText('Billing', 'Country') ?></label>
<tr><td><input type="text" id="iCountry" name="country"> <tr><td><input type="text" id="iCountry" name="country">
</table> </table>
</form> </form>
@ -114,26 +114,26 @@ echo $this->getData('nav')->render(); ?>
<div class="tab"> <div class="tab">
<div class="box w-100"> <div class="box w-100">
<table class="table"> <table class="table">
<caption><?= $this->l11n->lang['Billing']['Invoice'] ?></caption> <caption><?= $this->l11n->getText('Billing', 'Invoice') ?></caption>
<thead> <thead>
<tr> <tr>
<td> <td>
<td><?= $this->l11n->lang['Billing']['Item']; ?> <td><?= $this->l11n->getText('Billing', 'Item'); ?>
<td><?= $this->l11n->lang['Billing']['Variation']; ?> <td><?= $this->l11n->getText('Billing', 'Variation'); ?>
<td class="wf-100"><?= $this->l11n->lang['Billing']['Name']; ?> <td class="wf-100"><?= $this->l11n->getText('Billing', 'Name'); ?>
<td><?= $this->l11n->lang['Billing']['Quantity']; ?> <td><?= $this->l11n->getText('Billing', 'Quantity'); ?>
<td><?= $this->l11n->lang['Billing']['Discount']; ?> <td><?= $this->l11n->getText('Billing', 'Discount'); ?>
<td><?= $this->l11n->lang['Billing']['DiscountP']; ?> <td><?= $this->l11n->getText('Billing', 'DiscountP'); ?>
<td><?= $this->l11n->lang['Billing']['Bonus']; ?> <td><?= $this->l11n->getText('Billing', 'Bonus'); ?>
<td><?= $this->l11n->lang['Billing']['Tax']; ?> <td><?= $this->l11n->getText('Billing', 'Tax'); ?>
<td><?= $this->l11n->lang['Billing']['Net']; ?> <td><?= $this->l11n->getText('Billing', 'Net'); ?>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="8"><!-- todo: make this look nicer. even as alpha release this looks bad. --> <td colspan="8"><!-- todo: make this look nicer. even as alpha release this looks bad. -->
<?= $this->l11n->lang['Billing']['Freightage']; ?>: 0.00 - <?= $this->l11n->getText('Billing', 'Freightage'); ?>: 0.00 -
<?= $this->l11n->lang['Billing']['Net']; ?>: 0.00 - <?= $this->l11n->getText('Billing', 'Net'); ?>: 0.00 -
<?= $this->l11n->lang['Billing']['Tax']; ?>: 0.00 - <?= $this->l11n->getText('Billing', 'Tax'); ?>: 0.00 -
<?= $this->l11n->lang['Billing']['Total']; ?>: 0.00 <?= $this->l11n->getText('Billing', 'Total'); ?>: 0.00
<tbody> <tbody>
<tr> <tr>
<td><i class="fa fa-plus"></i> <i class="fa fa-chevron-up"></i> <i class="fa fa-chevron-down"></i> <td><i class="fa fa-plus"></i> <i class="fa fa-chevron-up"></i> <i class="fa fa-chevron-down"></i>