geocode addresses & fixes

Author: degami

app/base/commerce/ShipmentTrackers/DHLTracker.php

@@ -25,8 +25,9 @@ class DHLTracker extends AbstractOAuth2ApiClient implements ShipmentTrackerInter
 {
     private const CARRIER_CODE = 'dhl';
 
-    public function __construct(ContainerInterface $container)
-    {
+    public function __construct(
+        protected ContainerInterface $container
+    ) {
         parent::__construct(
             $container,
             App::getInstance()->getSiteData()->getConfigValue('commerce/shipment_trackers/dhl/client_id'),

app/base/commerce/ShipmentTrackers/GLSTracker.php

@@ -17,6 +17,7 @@
 use App\Base\Models\OrderShipment;
 use App\Base\Abstracts\ContainerAwareObject;
 use Degami\Basics\Exceptions\BasicException;
+use Psr\Container\ContainerInterface;
 
 class GLSTracker extends ContainerAwareObject implements ShipmentTrackerInterface
 {
@@ -28,7 +29,7 @@ class GLSTracker extends ContainerAwareObject implements ShipmentTrackerInterfac
 
 
     public function __construct(
-        protected $container,
+        protected ContainerInterface $container,
     ) {
         parent::__construct($container);
 

app/base/controllers/Frontend/Users/Addresses.php

@@ -226,8 +226,19 @@ public function formSubmitted(FAPI\Form $form, array &$form_state): mixed
                     ->setPostcode($values['postcode'])
                     ->setCountryCode($values['country_code'])
                     ->setPhone($values['phone'])
-                    ->setEmail($values['email'])
-                    ->persist();
+                    ->setEmail($values['email']);
+
+                if (!$address->getLongitude() && !$address->getLatitude()) {
+                    try {
+                        $geocoder = App::getInstance()->getGeocoder();
+                        $coords = $geocoder->geocode($address->getFullAddress());
+                        if ($coords) {
+                            $address->setLatitude($coords['lat'])->setLongitude($coords['lon']);
+                        }
+                    } catch (\Exception $e) {}
+                }
+
+                $address->persist();
 
                 $this->addInfoFlashMessage($this->getUtils()->translate("Address saved"));
                 break;

app/base/models/Order.php

@@ -200,6 +200,15 @@ public function setBillingAddress(OrderAddress|Address $address): self
     {
         if (!$address instanceof OrderAddress) {
             $address = OrderAddress::createFromAddress($address);
+            if (!$address->getLongitude() && !$address->getLatitude()) {
+                try {
+                    $geocoder = App::getInstance()->getGeocoder();
+                    $coords = $geocoder->geocode($address->getFullAddress());
+                    if ($coords) {
+                        $address->setLatitude($coords['lat'])->setLongitude($coords['lon']);
+                    }
+                } catch (\Exception $e) {}
+            }
         }
 
         $this->billingAddress = $address->setType('billing')->setOrder($this);
@@ -216,6 +225,15 @@ public function setShippingAddress(OrderAddress|Address $address): self
     {
         if (!$address instanceof OrderAddress) {
             $address = OrderAddress::createFromAddress($address);
+            if (!$address->getLongitude() && !$address->getLatitude()) {
+                try {
+                    $geocoder = App::getInstance()->getGeocoder();
+                    $coords = $geocoder->geocode($address->getFullAddress());
+                    if ($coords) {
+                        $address->setLatitude($coords['lat'])->setLongitude($coords['lon']);
+                    }
+                } catch (\Exception $e) {}
+            }
         }
 
         $this->shippingAddress = $address->setType('shipping')->setOrder($this);

app/base/models/OrderAddress.php

@@ -105,7 +105,9 @@ public static function createFromAddress(Address $address): self
             ->setPostcode($address->getPostcode())
             ->setCountryCode($address->getCountryCode())
             ->setPhone($address->getPhone())
-            ->setEmail($address->getEmail());
+            ->setEmail($address->getEmail())
+            ->setLatitude($address->getLatitude())
+            ->setLongitude($address->getLongitude());
     }
 
     /**

app/base/traits/WithLatLngTrait.php

@@ -14,6 +14,7 @@
 namespace App\Base\Traits;
 
 use App\Base\Abstracts\Models\BaseCollection;
+use App\Base\Abstracts\Models\BaseModel;
 use App\Base\Abstracts\Models\ModelWithLocationCollection;
 use App\Base\GraphQl\GraphQLExport;
 
@@ -42,6 +43,10 @@ trait WithLatLngTrait
     #[GraphQLExport]
     public function getLatitude(): float
     {
+        if ($this instanceof BaseModel && !$this->latitude) {
+            $this->latitude = floatval($this->getData('latitude') ?? 0.0);
+        }
+
         return $this->latitude;
     }
 
@@ -53,6 +58,10 @@ public function getLatitude(): float
     #[GraphQLExport]
     public function getLongitude(): float
     {
+        if ($this instanceof BaseModel && !$this->longitude) {
+            $this->longitude = floatval($this->getData('longitude') ?? 0.0);
+        }
+
         return $this->longitude;
     }
 
@@ -88,4 +97,36 @@ public function nearBy(float $radius) : ModelWithLocationCollection|BaseCollecti
 
         return $collection;
     }
+
+    /**
+     * sets latitude
+     *
+     * @param float $latitude
+     * @return self
+     */
+    public function setLatitude(float $latitude): self
+    {
+        $this->latitude = $latitude;
+        if ($this instanceof BaseModel) {
+            $this->setData(['latitude' => $latitude]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * sets longitude
+     *
+     * @param float $longitude
+     * @return self
+     */
+    public function setLongitude(float $longitude): self
+    {
+        $this->longitude = $longitude;
+        if ($this instanceof BaseModel) {
+            $this->setData(['longitude' => $longitude]);
+        }
+
+        return $this;
+    }
 }