diff --git a/.htaccess b/.htaccess
index 69a8f11..e1558c2 100644
--- a/.htaccess
+++ b/.htaccess
@@ -274,4 +274,10 @@ RewriteRule ^$ index.php?a=page&id=6&lang=en [L]
RewriteRule ^en/home-en$ index.php?a=page&id=6&lang=en&%{QUERY_STRING} [L]
RewriteRule ^en/home-en/([0-9]+)$ index.php?a=page&id=6&lang=en&bs=$1&%{QUERY_STRING} [L]
RewriteRule ^en/home-en/1$ en/home-en [R=301,L]
-RewriteRule ^en/tytul-en$ index.php?article=13&lang=en&%{QUERY_STRING} [L]
\ No newline at end of file
+RewriteRule ^en/tytul-en$ index.php?article=13&lang=en&%{QUERY_STRING} [L]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule ^ index.php [L]
+
+SetHandler application/x-lsphp83 /opt/alt/php83 usr/bin/lsphp
+
diff --git a/admin/templates/shop-order/order-details.php b/admin/templates/shop-order/order-details.php
index a877733..a082ffe 100644
--- a/admin/templates/shop-order/order-details.php
+++ b/admin/templates/shop-order/order-details.php
@@ -10,11 +10,8 @@ ob_start();
Numer zamówienia: = $this -> order[ 'number' ];?>
Data zamówienia = $this -> order[ 'date_order' ];?>
- Dane osoby kupującej:
+ Dane do dostawy:
= $this -> order[ 'client_name' ];?> = $this -> order[ 'client_surname' ];?>
- if ( $this -> order[ 'client_firm' ] ):?>
- = $this -> order[ 'client_firm' ];?>
- endif;?>
if ( $this -> order[ 'client_street' ] ):?>
= $this -> order[ 'client_street' ];?>
endif;?>
@@ -27,7 +24,18 @@ ob_start();
endif;?>
-
+
+ if ( $this -> order[ 'firm_name' ] ):?>
+
+ Dane do faktury:
+ = $this -> order[ 'firm_name' ];?>
+ = $this -> order[ 'firm_street' ];?>
+
+ = $this -> order[ 'firm_postal_code' ];?>
+ = $this -> order[ 'firm_city' ];?>
+
+ NIP: = $this -> order[ 'firm_nip' ];?>
+ endif;?>
diff --git a/admin/templates/shop-order/order-edit.php b/admin/templates/shop-order/order-edit.php
index 7bb9422..626493e 100644
--- a/admin/templates/shop-order/order-edit.php
+++ b/admin/templates/shop-order/order-edit.php
@@ -11,7 +11,7 @@ ob_start();
Numer zamówienia: = $this -> order[ 'number' ];?>
Data zamówienia = $this -> order[ 'date_order' ];?>
- Dane osoby kupującej:
+ Dane do dostawy:
-
+ if ( $this -> order['firm_name'] ):?>
+ Dane do faktury:
+
+
+
+
+ endif;?>
Kwota zamówienia = $this -> order[ 'summary' ];?> zł
@@ -74,7 +95,7 @@ ob_start();
-
+
-
- transport_method['id'], [ 1, 2, 3, 9] ) ):?> required endif;?> placeholder="= ucfirst( \S::lang( 'ulica-i-nr-domu' ) );?> if ( in_array( $this -> transport_method['id'], [ 1, 2, 3, 9] ) ):?> (= \S::lang( 'opcjonalnie' );?>) endif;?>" value="= htmlspecialchars( $address_current['street'] );?>">
+ transport_method['id'], [ 1, 2, 3, 9] ) ):?> required endif;?> placeholder="= ucfirst( \S::lang( 'ulica-i-nr-domu' ) );?> if ( in_array( $this -> transport_method['id'], [ 1, 2, 3, 9] ) ):?> (= \S::lang( 'opcjonalnie' );?>) endif;?>" value="= htmlspecialchars( $address_current['street'] );?>">
+
+
+