Dodanie obsługi danych firmy w formularzach oraz poprawa warunków sprawdzających wagę produktu

2025-01-04 12:11:29 +01:00
parent 9a775d8ec0
commit d8fe9e78fb
23 changed files with 5316 additions and 5840 deletions
--- a/autoload/admin/controls/class.Settings.php
+++ b/autoload/admin/controls/class.Settings.php
@@ -9,7 +9,8 @@ class Settings
    \S::delete_dir( '../thumbs/' );

    $redis = \RedisConnection::getInstance() -> getConnection();
-    $redis -> flushAll();
+    if ( $redis )
+      $redis -> flushAll();

    \S::alert( 'Cache został wyczyszczony.' );
    header( 'Location: /admin/dashboard/main_view/' );
--- a/autoload/admin/controls/class.ShopOrder.php
+++ b/autoload/admin/controls/class.ShopOrder.php
@@ -31,8 +31,7 @@ class ShopOrder
  static public function order_save()
  {
    if ( \shop\Order::order_save_by_admin(
-            \S::get( 'order_id' ), \S::get( 'client_name' ), \S::get( 'client_surname' ), \S::get( 'client_firm' ), \S::get( 'client_street' ), \S::get( 'client_postal_code' ), \S::get( 'client_city' ), \S::get( 'client_email' ),
-            \S::get( 'transport_id' ), \S::get( 'inpost_paczkomat' ), \S::get( 'payment_method_id' )
+            \S::get( 'order_id' ), \S::get( 'client_name' ), \S::get( 'client_surname' ), \S::get( 'client_street' ), \S::get( 'client_postal_code' ), \S::get( 'client_city' ), \S::get( 'client_email' ), \S::get( 'firm_name' ), \S::get( 'firm_street' ), \S::get( 'firm_postal_code' ), \S::get( 'firm_city' ), \S::get( 'firm_nip' ), \S::get( 'transport_id' ), \S::get( 'inpost_paczkomat' ), \S::get( 'payment_method_id' )
          ) )
      \S::alert( 'Zamówienie zostało zapisane.' );

--- a/autoload/admin/factory/class.ShopProduct.php
+++ b/autoload/admin/factory/class.ShopProduct.php
@@ -1285,7 +1285,8 @@ class ShopProduct
      \S::delete_dir( '../thumbs/' );

      $redis = \RedisConnection::getInstance() -> getConnection();
-      $redis -> flushAll();
+      if ( $redis )
+        $redis -> flushAll();

      return $product_id;
    }
--- a/autoload/front/controls/class.ShopBasket.php
+++ b/autoload/front/controls/class.ShopBasket.php
@@ -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' ),
--- a/autoload/front/controls/class.ShopClient.php
+++ b/autoload/front/controls/class.ShopClient.php
@@ -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' ) );
    }
--- a/autoload/front/factory/class.ShopClient.php
+++ b/autoload/front/factory/class.ShopClient.php
@@ -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,
--- a/autoload/front/factory/class.ShopOrder.php
+++ b/autoload/front/factory/class.ShopOrder.php
@@ -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,
--- a/autoload/shop/class.Order.php
+++ b/autoload/shop/class.Order.php
@@ -423,7 +423,7 @@ class Order implements \ArrayAccess
  }

  // ADMIN - zmiana zamówienia
-  static public function order_save_by_admin( int $order_id, string $client_name, string $client_surname, string $client_firm, string $client_street, string $client_postal_code, string $client_city, string $client_email,
+  static public function order_save_by_admin( int $order_id, string $client_name, string $client_surname, string $client_street, string $client_postal_code, string $client_city, string $client_email, $firm_name = '', $firm_street = '', $firm_postal_code = '', $firm_city = '', $firm_nip = '',
    int $transport_id, string $inpost_paczkomat, int $payment_method_id )
  {
    global $mdb, $user;
@@ -431,11 +431,15 @@ class Order implements \ArrayAccess
    $mdb -> update( 'pp_shop_orders', [
              'client_name' => $client_name,
              'client_surname' => $client_surname,
-              'client_firm' => $client_firm,
              'client_street' => $client_street,
              'client_postal_code' => $client_postal_code,
              'client_city' => $client_city,
              'client_email' => $client_email,
+              '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' => $mdb -> get( 'pp_shop_transports', 'name_visible', [ 'id' => $transport_id ] ),
              'transport_cost' => $mdb -> get( 'pp_shop_transports', 'cost', [ 'id' => $transport_id ] ),