Project-Pro/marianek.pl
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dodanie obsługi danych firmy w formularzach oraz poprawa warunków sprawdzających w kodzie

Browse Source
This commit is contained in:
Jacek Pyziak
2025-01-04 12:11:00 +01:00
parent 18dd1718a4
commit 5adfbf5eab
23 changed files with 218 additions and 756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
admin/templates/shop-order/order-details.php
View File

@@ -10,11 +10,8 @@ ob_start();
<div class="text-big">Numer zamówienia: <b id="order-number"><?= $this -> order[ 'number' ];?></b> <i class="fa fa-copy" onclick="copyToClipboard( 'order-number' ); return false;"></i></div>
<div>Data zamówienia <b><?= $this -> order[ 'date_order' ];?></b></div>
<br>
<div class="text-big">Dane osoby kupującej:</div>
<div class="text-big">Dane do dostawy:</div>
<div><b id="order-user-name"><?= $this -> order[ 'client_name' ];?> <?= $this -> order[ 'client_surname' ];?></b> <i class="fa fa-copy" onclick="copyToClipboard( 'order-user-name' ); return false;"></i></div>
<? if ( $this -> order[ 'client_firm' ] ):?>
<div><b><?= $this -> order[ 'client_firm' ];?></b></div>
<? endif;?>
<? if ( $this -> order[ 'client_street' ] ):?>
<div><b id="order-street"><?= $this -> order[ 'client_street' ];?></b> <i class="fa fa-copy" onclick="copyToClipboard( 'order-street' ); return false;"></i></div>
<? endif;?>
@@ -27,7 +24,18 @@ ob_start();
<? endif;?>
</div>
<div><b><a href="mailto:<?= $this -> order[ 'client_email' ];?>" id="order-user-email"><?= $this -> order[ 'client_email' ];?></a></b> <i class="fa fa-copy" onclick="copyToClipboard( 'order-user-email' ); return false;"></i></div>
<div><b><a href="tel:<?= $this -> order[ 'client_phone' ];?>" id="order-user-phone"><?= $this -> order[ 'client_phone' ];?></a></b> <i class="fa fa-copy" onclick="copyToClipboard( 'order-user-phone' ); return false;"></i></div>
<div><b><a href="tel:<?= $this -> order[ 'client_phone' ];?>" id="order-user-phone"><?= preg_replace( "/(\d{3})(\d{3})(\d{3})/", "$1 $2 $3", $this -> order[ 'client_phone' ] );?></a></b> <i class="fa fa-copy" onclick="copyToClipboard( 'order-user-phone' ); return false;"></i></div>
<? if ( $this -> order[ 'firm_name' ] ):?>
<br>
<div class="text-big">Dane do faktury:</div>
<div><b id="order-firm-name"><?= $this -> order[ 'firm_name' ];?></b> <i class="fa fa-copy" onclick="copyToClipboard( 'order-firm-name' ); return false;"></i></div>
<div><b id="order-firm-street"><?= $this -> order[ 'firm_street' ];?></b> <i class="fa fa-copy" onclick="copyToClipboard( 'order-firm-street' ); return false;"></i></div>
<div>
<b id="order-firm-postal-code"><?= $this -> order[ 'firm_postal_code' ];?></b> <i class="fa fa-copy" onclick="copyToClipboard( 'order-firm-postal-code' ); return false;"></i>
<b id="order-firm-city"><?= $this -> order[ 'firm_city' ];?></b> <i class="fa fa-copy" onclick="copyToClipboard( 'order-firm-city' ); return false;"></i>
</div>
<div>NIP: <b id="order-firm-nip"><?= $this -> order[ 'firm_nip' ];?></b> <i class="fa fa-copy" onclick="copyToClipboard( 'order-firm-nip' ); return false;"></i></div>
<? endif;?>
<div class="resend_order_confirmation_email">
<button class="btn btn-primary">wyślij ponownie mail z potwierdzeniem zamówienia</button>
</div>

35
admin/templates/shop-order/order-edit.php
View File

@@ -11,7 +11,7 @@ ob_start();
<div class="text-big">Numer zamówienia: <b id="order-number"><?= $this -> order[ 'number' ];?></b> <i class="fa fa-copy" onclick="copyToClipboard( 'order-number' ); return false;"></i></div>
<div>Data zamówienia <b><?= $this -> order[ 'date_order' ];?></b></div>
<br>
<div class="text-big">Dane osoby kupującej:</div>
<div class="text-big">Dane do dostawy:</div>
<div class="row">
<div class="col-sm-6">
<input type="text" class="form-control" name="client_name" value="<?= $this -> order[ 'client_name' ];?>" placeholder="Imię">
@@ -20,11 +20,6 @@ ob_start();
<input type="text" class="form-control" name="client_surname" value="<?= $this -> order[ 'client_surname' ];?>" placeholder="Nazwisko">
</div>
</div>
<div class="row">
<div class="col-12">
<input type="text" class="form-control" name="client_firm" value="<?= $this -> order[ 'client_firm' ];?>" placeholder="Firma">
</div>
</div>
<div class="row">
<div class="col-12">
<input type="text" class="form-control" name="client_street" value="<?= $this -> order[ 'client_street' ];?>" placeholder="Ulica">
@@ -48,6 +43,32 @@ ob_start();
<input type="text" class="form-control" name="client_phone" value="<?= $this -> order[ 'client_phone' ];?>" placeholder="Telefon">
</div>
</div>
<? if ( $this -> order['firm_name'] ):?>
<div class="text-big">Dane do faktury:</div>
<div class="row">
<div class="col-12">
<input type="text" class="form-control" name="firm_name" value="<?= $this -> order[ 'firm_name' ];?>" placeholder="Nazwa firmy">
</div>
</div>
<div class="row">
<div class="col-12">
<input type="text" class="form-control" name="firm_street" value="<?= $this -> order[ 'firm_street' ];?>" placeholder="Ulica">
</div>
</div>
<div class="row">
<div class="col-sm-6">
<input type="text" class="form-control" name="firm_postal_code" value="<?= $this -> order[ 'firm_postal_code' ];?>" placeholder="Kod pocztowy">
</div>
<div class="col-sm-6">
<input type="text" class="form-control" name="firm_city" value="<?= $this -> order[ 'firm_city' ];?>" placeholder="Miasto">
</div>
</div>
<div class="row">
<div class="col-12">
<input type="text" class="form-control" name="firm_nip" value="<?= $this -> order[ 'firm_nip' ];?>" placeholder="NIP">
</div>
</div>
<? endif;?>
</div>
<div class="col-md-6">
<div>Kwota zamówienia <b><?= $this -> order[ 'summary' ];?> zł</b></div>
@@ -74,7 +95,7 @@ ob_start();
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<select name="payment_method_id" class="form-control" id="payment_method_id">

4
admin/templates/update/main-view.php
View File

@@ -18,9 +18,7 @@ ob_start();
)
);?>
<?
$ver_new = $this->new_ver;
$ver= $this->ver;
$valuemax = ($ver_new - $ver)*1000;
$valuemax = ( $this -> new_ver - $this -> ver ) * 1000;
?>
<div class="progress-box hidden">
<div class="version">