pcwvanbeers/Commerce
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development'

Browse Source 
#Conflicts:
#	admin/countries.php
#	cart.php
#	custom/css/main.css
#	custom/customfunctions.php
#	custom/email/order-details-template.php
#	custom/email/order-invoice-template.php
#	custom/email/order-notification-template.php
#	custom/pages/about.php
#	custom/pages/about_morval.php
#	custom/settings/config.php
#	custom/settings/settings.php
#	functions.php
#	home.php
#	products.php
#	script.js
This commit is contained in:
“VeLiTi”
2025-08-12 15:46:06 +02:00
parent b9193fc3dc 60a32a7ff9
commit e4ddab934c
39 changed files with 13014 additions and 4983 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
custom/email/order-invoice-template.php
View File

@@ -1,7 +1,16 @@
<?php
//(defined(security_key) or defined('admin')) or exit;
//(defined(security_key) or defined('admin')) or exit; ?>
template_order_email_header($user_language);
include './custom/translations/translations_'.strtoupper($user_language).'.php';
include './custom/settings/settings.php';
//GET USER COUNTRY FROM ID
$country = isset($countries_in_scope[$invoice_cust['customer']['country']]) ? (${$countries_in_scope[$invoice_cust['customer']['country']]} ?? $countries_in_scope[$invoice_cust['customer']['country']]) : "";
?>
<<<<<<< HEAD
<?=template_order_email_header($user_language)?>
<?php
@@ -33,21 +42,42 @@ $country = isset($countries_in_scope[$invoice_cust['customer']['country']]) ? ($
</header>
<main>
<div class="content-wrapper">
=======
</tr>
<tr><td><br></td></tr>
<tr>
<td>
<?=$invoice_cust['customer']['name']?><br>
<?=$invoice_cust['customer']['street']?><br>
<?=$invoice_cust['customer']['zip']?>, <?=$invoice_cust['customer']['city']?><br>
<?=$country?>
</td>
</tr>
<tr><td><br></td></tr>
<tr>
<td><h2><?=$order_invoice_text ?? 'Invoice'?>: <?=$invoice_cust['invoice']['id']?></h2></td>
<td><p><?=$order_date_text ?? 'Date'?>: <?php echo date("Y-m-d", strtotime($invoice_cust['invoice']['created']))?></p></td>
</tr>
</table>
</div>
</header>
<main>
<div class="content-wrapper" style="width:100%;max-width:700px;margin:auto;">
>>>>>>> development
<div class="table order-table">
<table>
<thead>
<tr>
<td><?=$tr_product ?? 'Product' ?></td>
<td><?=$tr_options ?? 'Options' ?></td>
<td><?=$tr_quantity ?? 'Quantity'?></td>
<td><?=$tr_price ?? 'Price' ?></td>
<td style="text-align:right;"><?=$tr_total?></td>
<th><?=$tr_product ?? 'Product' ?></th>
<th><?=$tr_options ?? 'Options' ?></th>
<th><?=$tr_quantity ?? 'Quantity'?></th>
<th><?=$tr_price ?? 'Price' ?></th>
<th style="text-align:right;"><?=$tr_total?></th>
</tr>
</thead>
<tbody>
<?php
<?php
foreach($invoice_cust['products'] as $product): ?>
<?php
if (isset($product['options']) && $product['options'] !=''){
$prod_options = '';
@@ -58,20 +88,20 @@ $country = isset($countries_in_scope[$invoice_cust['customer']['country']]) ? ($
?>
<tr>
<td><?=${$product['product_name']} ?? $product['product_name'] ?></td>
<td><?=htmlspecialchars(substr($prod_options, 0,-2), ENT_QUOTES)?></td>
<td><?=htmlspecialchars(substr($prod_options, 0,-2), ENT_QUOTES)?></td>
<td><?=$product['quantity']?></td>
<td><?=currency_code?> <?=number_format($product['price'],2)?></td>
<td style="text-align:right;"><?=currency_code?> <?=number_format($product['line_total'],2)?></td>
<td class="num"><?=currency_code?> <?=number_format($product['line_total'],2)?></td>
</tr>
<?php endforeach; ?>
<tr>
<td colspan="5" class="item-list-end"></td>
<?php endforeach; ?>
<tr class="item-list-end">
<td colspan="5"></td>
</tr>
<tr>
<td colspan="4" class="subtotal"><?=$total_subtotal?></td>
<td class="num"><?=currency_code?> <?=number_format($invoice_cust['pricing']['subtotal'],2)?></td>
</tr>
<tr>
<tr>
<td colspan="4" class="subtotal"><?=$total_discount?></td>
<td class="num"><?=currency_code?> <?=number_format($invoice_cust['pricing']['discount_total'],2)?></td>
</tr>
@@ -89,12 +119,12 @@ $country = isset($countries_in_scope[$invoice_cust['customer']['country']]) ? ($
</tr>
</tbody>
</table>
</div>
</div>
<?php if($invoice_cust['invoice']['payment_status'] === 1){
</div>
<?php if($invoice_cust['invoice']['payment_status'] === 1){
echo '
<div class="content-wrapper">
<p>'.($invoice_payment_paid_text ?? 'Het totaalbedrag van deze factuur is betaald').'</p>
</div>';
}
?>
?>