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

6
autoload/front/controls/class.ShopBasket.php
View File

@@ -373,10 +373,14 @@ class ShopBasket
\S::get( 'phone', true ),
\S::get( 'name', true ),
\S::get( 'surname', true ),
\S::get( 'firm', true ),
\S::get( 'street' ),
\S::get( 'postal_code', true ),
\S::get( 'city', true ),
\S::get( 'firm_name', true ),
\S::get( 'firm_street', true ),
\S::get( 'firm_postal_code', true ),
\S::get( 'firm_city', true ),
\S::get( 'firm_nip', true ),
\S::get_session( 'basket-inpost-info' ),
\S::get_session( 'basket_orlen_point_id' ),
\S::get_session( 'basket_orlen_point_info' ),

2
autoload/front/controls/class.ShopClient.php
View File

@@ -63,7 +63,7 @@ class ShopClient
exit;
}
if ( \front\factory\ShopClient::address_save( $client['id'], \S::get( 'address_id' ), \S::get( 'name', true ), \S::get( 'surname', true ), \S::get( 'firm', true ), \S::get( 'street' ), \S::get( 'postal_code', true ), \S::get( 'city', true ), \S::get( 'phone', true ) ) )
if ( \front\factory\ShopClient::address_save( $client['id'], \S::get( 'address_id' ), \S::get( 'name', true ), \S::get( 'surname', true ), \S::get( 'street' ), \S::get( 'postal_code', true ), \S::get( 'city', true ), \S::get( 'phone', true ) ) )
{
\S::get( 'address_id' ) ? \S::alert( \S::lang( 'zmiana-adresu-sukces' ) ) : \S::alert( \S::lang( 'dodawanie-nowego-adresu-sukces' ) );
}

4
autoload/front/factory/class.ShopClient.php
View File

@@ -48,7 +48,7 @@ class ShopClient
return $mdb -> select( 'pp_shop_clients_addresses', '*', [ 'client_id' => (int)$client_id ] );
}
public static function address_save( $client_id, $address_id, $name, $surname, $firm, $street, $postal_code, $city, $phone )
public static function address_save( $client_id, $address_id, $name, $surname, $street, $postal_code, $city, $phone )
{
global $mdb;
@@ -58,7 +58,6 @@ class ShopClient
'client_id' => $client_id,
'name' => $name,
'surname' => $surname,
'firm' => $firm,
'street' => $street,
'postal_code' => $postal_code,
'city' => $city,
@@ -71,7 +70,6 @@ class ShopClient
if ( $mdb -> update( 'pp_shop_clients_addresses', [
'name' => $name,
'surname' => $surname,
'firm' => $firm,
'street' => $street,
'postal_code' => $postal_code,
'city' => $city,

14
autoload/front/factory/class.ShopOrder.php
View File

@@ -73,10 +73,14 @@ class ShopOrder
$phone,
$name,
$surname,
$firm,
$street,
$postal_code,
$city,
$firm_name,
$firm_street,
$firm_postal_code,
$firm_city,
$firm_nip,
$inpost_info,
$orlen_point_id,
$orlen_point_info,
@@ -88,7 +92,7 @@ class ShopOrder
if ( $client_id )
$email = \front\factory\ShopClient::client_email( $client_id );
if ( !is_array( $basket ) or!$transport_id or!$payment_id or!$email or!$phone or!$name or!$surname )
if ( !is_array( $basket ) or !$transport_id or !$payment_id or !$email or !$phone or !$name or !$surname )
return false;
$transport = \front\factory\ShopTransport::transport( $transport_id );
@@ -110,12 +114,16 @@ class ShopOrder
'comment' => null,
'client_name' => $name,
'client_surname' => $surname,
'client_firm' => $firm,
'client_email' => $email,
'client_street' => $street,
'client_postal_code' => $postal_code,
'client_city' => $city,
'client_phone' => $phone,
'firm_name' => $firm_name ? $firm_name : null,
'firm_street' => $firm_street ? $firm_street : null,
'firm_postal_code' => $firm_postal_code ? $firm_postal_code : null,
'firm_city' => $firm_city ? $firm_city : null,
'firm_nip' => $firm_nip ? $firm_nip : null,
'transport_id' => $transport_id,
'transport' => $transport[ 'name_visible' ],
'transport_cost' => $transport_cost,