2.0-beta9 (#161)

CHANGELOG.md

@@ -3,15 +3,30 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-[Unreleased]
+## 2.0-beta9 - 2022-02-11
 
 ### Fixed
 
 - If an attribute value is null it will be returned instead of the `{"en": null}` encoded string. ([#130](https://github.com/getcandy/getcandy/issues/130))
+- When loading an exiting product with channel availabilty, the scheduling modal should no longer display without prompt.
+- `Product` and `ProductOption` models will now take the Scout prefix config setting on the indexes.
+- The `Text` fieldtype tolerance now accepts numeric values instead of just forcing strings.
+- Translating an attribute via `->translateAttribute('name')` will now handle non translatable fields for consistency.
+- When using the `getcandy:meilisearch:setup` only indexes available within the app should be affected.
+- When installing GetCandy the correct configuration or rich text fields should now be applied. By ([@KKSzymanowski](https://github.com/KKSzymanowski))
 
 ### Added
 
 - Added `Taxes` facade to ensure the `TaxManager` can be easily extended. ([#129](https://github.com/getcandy/getcandy/issues/129))
+- `collections` relationship has been added to the `Product` model. By ([@poppabear8883](https://github.com/poppabear8883))
+- GetCandy's models now support have added macro support. By ([@edcoreweb](https://github.com/edcoreweb))
+
+### Changed
+
+- Instead of assuming `$user->id` we know use `$user->getKey()`. By ([@ryanmitchell](https://github.com/ryanmitchell))
+- Big maintainence update to the Docblocks across the codebase to help with IDE support. By ([@KKSzymanowski](https://github.com/KKSzymanowski))
+
+[View Changes](https://github.com/getcandy/core/compare/2.0-beta8...2.0-beta9)
 
 ## 2.0-beta8 - 2022-02-01
 

database/migrations/2021_08_10_101547_create_media_table.php

@@ -8,7 +8,7 @@ class CreateMediaTable extends Migration
 {
     public function up()
     {
-        if (!Schema::hasTable('media')) {
+        if (! Schema::hasTable('media')) {
             Schema::create('media', function (Blueprint $table) {
                 $table->bigIncrements('id');
 

database/migrations/2021_08_17_142630_create_activity_log_table.php

@@ -10,7 +10,7 @@ public function up()
     {
         $tableName = config('activitylog.table_name');
 
-        if (!Schema::hasTable($tableName)) {
+        if (! Schema::hasTable($tableName)) {
             Schema::create($tableName, function (Blueprint $table) {
                 $table->bigIncrements('id');
                 $table->string('log_name')->nullable();

database/state/ConvertProductTypeAttributesToProducts.php

@@ -13,7 +13,7 @@ public function run()
     {
         $prefix = config('getcandy.database.table_prefix');
 
-        if (!$this->canRun()) {
+        if (! $this->canRun()) {
             return;
         }
 

database/state/EnsureDefaultTaxClassExists.php

@@ -9,7 +9,7 @@ class EnsureDefaultTaxClassExists
 {
     public function run()
     {
-        if (!$this->canRun() || !$this->shouldRun()) {
+        if (! $this->canRun() || ! $this->shouldRun()) {
             return;
         }
 
@@ -32,6 +32,6 @@ protected function canRun()
 
     protected function shouldRun()
     {
-        return !TaxClass::whereDefault(true)->count();
+        return ! TaxClass::whereDefault(true)->count();
     }
 }

database/state/EnsureUserOrdersHaveACustomer.php

@@ -10,7 +10,7 @@ class EnsureUserOrdersHaveACustomer
 {
     public function run()
     {
-        if (!$this->canRun()) {
+        if (! $this->canRun()) {
             return;
         }
 

src/Actions/Carts/CalculateLine.php

@@ -20,9 +20,8 @@ public function __construct(
     /**
      * Execute the action.
      *
-     * @param \GetCandy\Models\CartLine                $cartLine
-     * @param \Illuminate\Database\Eloquent\Collection $customerGroups
-     *
+     * @param  \GetCandy\Models\CartLine  $cartLine
+     * @param  \Illuminate\Database\Eloquent\Collection  $customerGroups
      * @return \GetCandy\Models\CartLine
      */
     public function execute(

src/Actions/Carts/CreateOrder.php

@@ -23,8 +23,7 @@ public function __construct(OrderReferenceGeneratorInterface $generator)
     /**
      * Execute the action.
      *
-     * @param \GetCandy\Models\Cart $cart
-     *
+     * @param  \GetCandy\Models\Cart  $cart
      * @return void
      */
     public function execute(

src/Actions/Carts/MergeCart.php

@@ -10,9 +10,8 @@ class MergeCart
     /**
      * Execute the action.
      *
-     * @param \GetCandy\Models\Cart $target
-     * @param \GetCandy\Models\Cart $source
-     *
+     * @param  \GetCandy\Models\Cart  $target
+     * @param  \GetCandy\Models\Cart  $source
      * @return \GetCandy\Models\Cart
      */
     public function execute(Cart $target, Cart $source)

src/Actions/Carts/ValidateCartForOrder.php

@@ -16,8 +16,7 @@ class ValidateCartForOrder
     /**
      * Execute the action.
      *
-     * @param \GetCandy\Models\Cart $cart
-     *
+     * @param  \GetCandy\Models\Cart  $cart
      * @return void
      */
     public function execute(
@@ -32,7 +31,7 @@ public function execute(
         }
 
         // Do we have a billing address?
-        if (!$cart->billingAddress) {
+        if (! $cart->billingAddress) {
             throw new BillingAddressMissingException(
                 __('getcandy::exceptions.carts.billing_missing')
             );
@@ -49,7 +48,7 @@ public function execute(
 
         // Is this cart shippable and if so, does it have a shipping address.
         if ($cart->getManager()->isShippable()) {
-            if (!$cart->shippingAddress) {
+            if (! $cart->shippingAddress) {
                 throw new ShippingAddressMissingException(
                     __('getcandy::exceptions.carts.shipping_missing')
                 );
@@ -65,7 +64,7 @@ public function execute(
             }
 
             // Do we have a shipping option applied?
-            if (!$cart->getManager()->getShippingOption()) {
+            if (! $cart->getManager()->getShippingOption()) {
                 throw new ShippingOptionMissingException();
             }
         }

src/Actions/Collections/SortProducts.php

@@ -10,8 +10,7 @@ class SortProducts
     /**
      * Execute the action.
      *
-     * @param \GetCandy\Models\Collection $collection
-     *
+     * @param  \GetCandy\Models\Collection  $collection
      * @return void
      */
     public function execute(Collection $collection)

src/Actions/Collections/SortProductsByPrice.php

@@ -11,10 +11,9 @@ class SortProductsByPrice
     /**
      * Execute the action.
      *
-     * @param \Illuminate\Support\Collection $products
-     * @param \GetCandy\Models\Currency      $currency
-     * @param string                         $direction
-     *
+     * @param  \Illuminate\Support\Collection  $products
+     * @param  \GetCandy\Models\Currency  $currency
+     * @param  string  $direction
      * @return void
      */
     public function execute(Collection $products, Currency $currency, $direction = 'asc')

src/Actions/Collections/SortProductsBySku.php

@@ -9,9 +9,8 @@ class SortProductsBySku
     /**
      * Execute the action.
      *
-     * @param \Illuminate\Support\Collection $products
-     * @param string                         $direction
-     *
+     * @param  \Illuminate\Support\Collection  $products
+     * @param  string  $direction
      * @return \Illuminate\Support\Collection
      */
     public function execute(Collection $products, $direction = 'asc')

src/Actions/Taxes/GetTaxZonePostcode.php

@@ -9,8 +9,7 @@ class GetTaxZonePostcode
     /**
      * Execute the action.
      *
-     * @param string $postcode
-     *
+     * @param  string  $postcode
      * @return null|\GetCandy\Models\TaxZonePostcode
      */
     public function execute($postcode)
@@ -21,7 +20,7 @@ public function execute($postcode)
             return $postcodeZone;
         }
 
-        if (!$postcodeZone) {
+        if (! $postcodeZone) {
             return null;
         }
 
@@ -33,7 +32,7 @@ public function execute($postcode)
         })->sort(fn ($current, $next) => $current['matches'] < $next['matches'])->first();
 
         // Give up, use default...
-        if (!$match) {
+        if (! $match) {
             return null;
         }
 
@@ -43,8 +42,7 @@ public function execute($postcode)
     /**
      * Return the zone or zones which match this postcode.
      *
-     * @param string $postcode
-     *
+     * @param  string  $postcode
      * @return \GetCandy\Models\TaxZonePostcode|\Illuminate\Support\Collection
      */
     protected function getZoneMatches($postcode)
@@ -61,9 +59,8 @@ protected function getZoneMatches($postcode)
     /**
      * Match wildcard postcodes and return number of matches.
      *
-     * @param string $wildcard
-     * @param string $haystack
-     *
+     * @param  string  $wildcard
+     * @param  string  $haystack
      * @return int
      */
     private function matchWildcard($wildcard, $haystack)

src/Addons/Manifest.php

@@ -43,13 +43,12 @@ public function build()
     /**
      * Format a given composer package into our addon format.
      *
-     * @param array $package
-     *
+     * @param  array  $package
      * @return void|array
      */
     protected function formatPackage($package)
     {
-        if (!$provider = $package['extra']['laravel']['providers'][0] ?? null) {
+        if (! $provider = $package['extra']['laravel']['providers'][0] ?? null) {
             return;
         }
 

src/Base/AttributeManifestInterface.php

@@ -9,8 +9,7 @@ interface AttributeManifestInterface
     /**
      * Add an attribute type.
      *
-     * @param string $classname
-     *
+     * @param  string  $classname
      * @return void
      */
     public function addType($classname);
@@ -25,8 +24,7 @@ public function getTypes(): Collection;
     /**
      * Return an attribute type by it's key.
      *
-     * @param string $handle
-     *
+     * @param  string  $handle
      * @return string|null
      */
     public function getType($handle);

src/Base/BaseModel.php

@@ -14,7 +14,7 @@ abstract class BaseModel extends Model
     /**
      * Create a new instance of the Model.
      *
-     * @param array $attributes
+     * @param  array  $attributes
      */
     public function __construct(array $attributes = [])
     {
@@ -26,9 +26,8 @@ public function __construct(array $attributes = [])
     /**
      * Handle dynamic method calls into the model.
      *
-     * @param string $method
-     * @param array  $parameters
-     *
+     * @param  string  $method
+     * @param  array  $parameters
      * @return mixed
      */
     public function __call($method, $parameters)
@@ -43,9 +42,8 @@ public function __call($method, $parameters)
     /**
      * Handle dynamic static method calls into the model.
      *
-     * @param string $method
-     * @param array  $parameters
-     *
+     * @param  string  $method
+     * @param  array  $parameters
      * @return mixed
      */
     public static function __callStatic($method, $parameters)

src/Base/CartSessionInterface.php

@@ -33,19 +33,17 @@ public function manager();
     /**
      * Associate a cart to a user.
      *
-     * @param \GetCandy\Models\Cart                      $cart
-     * @param \Illuminate\Contracts\Auth\Authenticatable $user
-     * @param string                                     $policy
-     *
+     * @param  \GetCandy\Models\Cart  $cart
+     * @param  \Illuminate\Contracts\Auth\Authenticatable  $user
+     * @param  string  $policy
      * @return void
      */
     public function associate(Cart $cart, Authenticatable $user, $policy);
 
     /**
      * Use the given cart and set to the session.
      *
-     * @param \GetCandy\Models\Cart $cart
-     *
+     * @param  \GetCandy\Models\Cart  $cart
      * @return void
      */
     public function use(Cart $cart);
@@ -60,17 +58,15 @@ public function getSessionKey();
     /**
      * Set the cart session channel.
      *
-     * @param \GetCandy\Models\Channel $channel
-     *
+     * @param  \GetCandy\Models\Channel  $channel
      * @return self
      */
     public function setChannel(Channel $channel);
 
     /**
      * Set the cart session currency.
      *
-     * @param \GetCandy\Models\Currency $currency
-     *
+     * @param  \GetCandy\Models\Currency  $currency
      * @return self
      */
     public function setCurrency(Currency $currency);

src/Base/Casts/AsAttributeData.php

@@ -13,16 +13,16 @@ class AsAttributeData implements Castable
     /**
      * Get the caster class to use when casting from / to this cast target.
      *
-     * @param array $arguments
-     *
+     * @param  array  $arguments
      * @return object|string
      */
     public static function castUsing(array $arguments)
     {
-        return new class() implements CastsAttributes {
+        return new class() implements CastsAttributes
+        {
             public function get($model, $key, $value, $attributes)
             {
-                if (!isset($attributes[$key])) {
+                if (! isset($attributes[$key])) {
                     return null;
                 }
 
@@ -31,7 +31,7 @@ public function get($model, $key, $value, $attributes)
                 $returnData = new Collection();
 
                 foreach ($data as $key => $item) {
-                    if (!in_array(FieldType::class, class_implements($item['field_type']))) {
+                    if (! in_array(FieldType::class, class_implements($item['field_type']))) {
                         throw new FieldTypeException('This field type is not supported.');
                     }
                     $returnData->put($key, new $item['field_type']($item['value']));