feat: add international bbp

myparcelnl · Mar 14, 2024 · f096fe7 · f096fe7
1 parent a446ca5
commit f096fe7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/src/Model/Account/CarrierOptions.php b/src/Model/Account/CarrierOptions.php
@@ -30,17 +30,24 @@ class CarrierOptions extends BaseModel
      */
     private $optional;
 
+    /**
+     * @var int
+     */
+    private $contractId;
+
     /**
      * @param  array $options
      *
      * @throws \Exception
      */
     public function __construct(array $options)
     {
-        $this->enabled  = (bool) $options['enabled'];
-        $this->optional = (bool) $options['optional'];
-        $this->carrier  = CarrierFactory::create($options['carrier']['id']);
-        $this->label    = $options['label'] ?? $this->carrier->getHuman();
+        var_dump($options); echo "\njoepiejoepie\n";
+        $this->enabled    = (bool) $options['enabled'];
+        $this->optional   = (bool) $options['optional'];
+        $this->carrier    = CarrierFactory::create($options['carrier']['id']);
+        $this->label      = $options['label'] ?? $this->carrier->getHuman();
+        $this->contractId = $options['subscription_id'] ?? null;
     }
 
     /**
@@ -74,4 +81,9 @@ public function isOptional(): bool
     {
         return $this->optional;
     }
+
+    public function hasContract(): bool
+    {
+        return (bool) $this->contractId;
+    }
 }
diff --git a/src/Model/Consignment/PostNLConsignment.php b/src/Model/Consignment/PostNLConsignment.php
@@ -72,13 +72,6 @@ public function getAllowedExtraOptions(): array
      */
     public function getAllowedPackageTypes(): array
     {
-        $cc = $this->getCountry() ?? $this->getLocalCountryCode();
-        if ($cc !== $this->getLocalCountryCode()) {
-            return [
-                self::PACKAGE_TYPE_PACKAGE_NAME,
-                self::PACKAGE_TYPE_MAILBOX_NAME,
-            ];
-        }
         return [
             self::PACKAGE_TYPE_PACKAGE_NAME,
             self::PACKAGE_TYPE_MAILBOX_NAME,