diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index 72f13b707..5ac28a244 100755 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -1,5 +1,6 @@ $this->updated_at, ]; } + } \ No newline at end of file diff --git a/packages/Webkul/API/Http/Resources/Catalog/AttributeOption.php b/packages/Webkul/API/Http/Resources/Catalog/AttributeOption.php index e0a9a8a5e..791e955f0 100644 --- a/packages/Webkul/API/Http/Resources/Catalog/AttributeOption.php +++ b/packages/Webkul/API/Http/Resources/Catalog/AttributeOption.php @@ -6,10 +6,12 @@ use Illuminate\Http\Resources\Json\JsonResource; class AttributeOption extends JsonResource { + /** * Transform the resource into an array. * * @param \Illuminate\Http\Request + * * @return array */ public function toArray($request) @@ -18,7 +20,8 @@ class AttributeOption extends JsonResource 'id' => $this->id, 'admin_name' => $this->admin_name, 'label' => $this->label, - 'swatch_value' => $this->swatch_value + 'swatch_value' => $this->swatch_value, ]; } + } \ No newline at end of file diff --git a/packages/Webkul/Attribute/src/Database/Factories/AttributeFactory.php b/packages/Webkul/Attribute/src/Database/Factories/AttributeFactory.php index 9682f5761..b5af6698c 100644 --- a/packages/Webkul/Attribute/src/Database/Factories/AttributeFactory.php +++ b/packages/Webkul/Attribute/src/Database/Factories/AttributeFactory.php @@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class AttributeFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -140,5 +139,4 @@ class AttributeFactory extends Factory ]; }); } - } diff --git a/packages/Webkul/Attribute/src/Database/Factories/AttributeFamilyFactory.php b/packages/Webkul/Attribute/src/Database/Factories/AttributeFamilyFactory.php index caaa05ecb..d103d1668 100644 --- a/packages/Webkul/Attribute/src/Database/Factories/AttributeFamilyFactory.php +++ b/packages/Webkul/Attribute/src/Database/Factories/AttributeFamilyFactory.php @@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class AttributeFamilyFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -30,5 +29,4 @@ class AttributeFamilyFactory extends Factory 'status' => 0, ]; } - } \ No newline at end of file diff --git a/packages/Webkul/Attribute/src/Database/Factories/AttributeOptionFactory.php b/packages/Webkul/Attribute/src/Database/Factories/AttributeOptionFactory.php index 37801f24f..ac013681e 100644 --- a/packages/Webkul/Attribute/src/Database/Factories/AttributeOptionFactory.php +++ b/packages/Webkul/Attribute/src/Database/Factories/AttributeOptionFactory.php @@ -8,7 +8,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class AttributeOptionFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -30,5 +29,4 @@ class AttributeOptionFactory extends Factory 'swatch_value' => null, ]; } - } \ No newline at end of file diff --git a/packages/Webkul/Attribute/src/Models/Attribute.php b/packages/Webkul/Attribute/src/Models/Attribute.php index 43ea1be24..79f929cb5 100755 --- a/packages/Webkul/Attribute/src/Models/Attribute.php +++ b/packages/Webkul/Attribute/src/Models/Attribute.php @@ -11,7 +11,6 @@ use Webkul\Attribute\Contracts\Attribute as AttributeContract; class Attribute extends TranslatableModel implements AttributeContract { - use HasFactory; public $translatedAttributes = ['name']; @@ -68,5 +67,4 @@ class Attribute extends TranslatableModel implements AttributeContract { return AttributeFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Attribute/src/Models/AttributeFamily.php b/packages/Webkul/Attribute/src/Models/AttributeFamily.php index 9729312a3..65fcc3b61 100755 --- a/packages/Webkul/Attribute/src/Models/AttributeFamily.php +++ b/packages/Webkul/Attribute/src/Models/AttributeFamily.php @@ -11,7 +11,6 @@ use Webkul\Attribute\Contracts\AttributeFamily as AttributeFamilyContract; class AttributeFamily extends Model implements AttributeFamilyContract { - use HasFactory; public $timestamps = false; @@ -87,5 +86,4 @@ class AttributeFamily extends Model implements AttributeFamilyContract { return AttributeFamilyFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Attribute/src/Models/AttributeOption.php b/packages/Webkul/Attribute/src/Models/AttributeOption.php index d1342069a..e57d231c2 100755 --- a/packages/Webkul/Attribute/src/Models/AttributeOption.php +++ b/packages/Webkul/Attribute/src/Models/AttributeOption.php @@ -2,9 +2,7 @@ namespace Webkul\Attribute\Models; -use Illuminate\Support\Facades\Storage; use Webkul\Core\Eloquent\TranslatableModel; -use Illuminate\Testing\Fluent\Concerns\Has; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Factories\HasFactory; use Webkul\Attribute\Database\Factories\AttributeOptionFactory; @@ -12,7 +10,6 @@ use Webkul\Attribute\Contracts\AttributeOption as AttributeOptionContract; class AttributeOption extends TranslatableModel implements AttributeOptionContract { - use HasFactory; public $timestamps = false; @@ -40,7 +37,7 @@ class AttributeOption extends TranslatableModel implements AttributeOptionContra public function swatch_value_url() { if ($this->swatch_value && $this->attribute->swatch_type == 'image') { - return url('cache/small/'.$this->swatch_value); + return url('cache/small/' . $this->swatch_value); } return; @@ -58,5 +55,4 @@ class AttributeOption extends TranslatableModel implements AttributeOptionContra { return AttributeOptionFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/BookingProduct/src/Database/Factories/BookingProductEventTicketFactory.php b/packages/Webkul/BookingProduct/src/Database/Factories/BookingProductEventTicketFactory.php index 584be0ac1..e8d018bf9 100644 --- a/packages/Webkul/BookingProduct/src/Database/Factories/BookingProductEventTicketFactory.php +++ b/packages/Webkul/BookingProduct/src/Database/Factories/BookingProductEventTicketFactory.php @@ -8,7 +8,6 @@ use Webkul\BookingProduct\Models\BookingProductEventTicket; class BookingProductEventTicketFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -29,5 +28,4 @@ class BookingProductEventTicketFactory extends Factory 'booking_product_id' => BookingProduct::factory(), ]; } - } \ No newline at end of file diff --git a/packages/Webkul/BookingProduct/src/Database/Factories/BookingProductFactory.php b/packages/Webkul/BookingProduct/src/Database/Factories/BookingProductFactory.php index 13edec3b5..dadda4250 100644 --- a/packages/Webkul/BookingProduct/src/Database/Factories/BookingProductFactory.php +++ b/packages/Webkul/BookingProduct/src/Database/Factories/BookingProductFactory.php @@ -9,7 +9,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class BookingProductFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -34,5 +33,4 @@ class BookingProductFactory extends Factory 'product_id' => Product::factory(['type' => 'booking']), ]; } - } \ No newline at end of file diff --git a/packages/Webkul/BookingProduct/src/Models/BookingProduct.php b/packages/Webkul/BookingProduct/src/Models/BookingProduct.php index a1cc69704..911f71ef2 100644 --- a/packages/Webkul/BookingProduct/src/Models/BookingProduct.php +++ b/packages/Webkul/BookingProduct/src/Models/BookingProduct.php @@ -3,14 +3,12 @@ namespace Webkul\BookingProduct\Models; use Illuminate\Database\Eloquent\Model; -use Webkul\Product\Models\ProductProxy; use Illuminate\Database\Eloquent\Factories\HasFactory; use Webkul\BookingProduct\Database\Factories\BookingProductFactory; use Webkul\BookingProduct\Contracts\BookingProduct as BookingProductContract; class BookingProduct extends Model implements BookingProductContract { - use HasFactory; protected $fillable = [ @@ -86,5 +84,4 @@ class BookingProduct extends Model implements BookingProductContract { return BookingProductFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/BookingProduct/src/Models/BookingProductEventTicket.php b/packages/Webkul/BookingProduct/src/Models/BookingProductEventTicket.php index ad364ce4d..b98066959 100644 --- a/packages/Webkul/BookingProduct/src/Models/BookingProductEventTicket.php +++ b/packages/Webkul/BookingProduct/src/Models/BookingProductEventTicket.php @@ -9,7 +9,6 @@ use Webkul\BookingProduct\Contracts\BookingProductEventTicket as BookingProductE class BookingProductEventTicket extends TranslatableModel implements BookingProductEventTicketContract { - use HasFactory; public $timestamps = false; @@ -37,5 +36,4 @@ class BookingProductEventTicket extends TranslatableModel implements BookingProd { return BookingProductEventTicketFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/BookingProduct/src/Providers/BookingProductServiceProvider.php b/packages/Webkul/BookingProduct/src/Providers/BookingProductServiceProvider.php index c816bdf3e..cf53b167b 100644 --- a/packages/Webkul/BookingProduct/src/Providers/BookingProductServiceProvider.php +++ b/packages/Webkul/BookingProduct/src/Providers/BookingProductServiceProvider.php @@ -11,20 +11,19 @@ class BookingProductServiceProvider extends ServiceProvider * Bootstrap services. * * @return void - * @throws \Illuminate\Contracts\Container\BindingResolutionException */ public function boot(): void { - $this->loadRoutesFrom(__DIR__.'/../Http/front-routes.php'); + $this->loadRoutesFrom(__DIR__ . '/../Http/front-routes.php'); - $this->loadMigrationsFrom(__DIR__.'/../Database/Migrations'); + $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); - $this->loadTranslationsFrom(__DIR__.'/../Resources/lang', 'bookingproduct'); + $this->loadTranslationsFrom(__DIR__ . '/../Resources/lang', 'bookingproduct'); - $this->loadViewsFrom(__DIR__.'/../Resources/views', 'bookingproduct'); + $this->loadViewsFrom(__DIR__ . '/../Resources/views', 'bookingproduct'); $this->publishes([ - __DIR__.'/../../publishable/assets' => public_path('themes/default/assets'), + __DIR__ . '/../../publishable/assets' => public_path('themes/default/assets'), ], 'public'); $this->app->register(EventServiceProvider::class); @@ -37,7 +36,7 @@ class BookingProductServiceProvider extends ServiceProvider */ public function register(): void { - $this->mergeConfigFrom(dirname(__DIR__).'/Config/product_types.php', 'product_types'); + $this->mergeConfigFrom(dirname(__DIR__) . '/Config/product_types.php', 'product_types'); } } \ No newline at end of file diff --git a/packages/Webkul/CartRule/src/Models/CartRule.php b/packages/Webkul/CartRule/src/Models/CartRule.php index 9100fc57e..78c324028 100644 --- a/packages/Webkul/CartRule/src/Models/CartRule.php +++ b/packages/Webkul/CartRule/src/Models/CartRule.php @@ -11,7 +11,6 @@ use Webkul\Customer\Models\CustomerGroupProxy; class CartRule extends Model implements CartRuleContract { - use HasFactory; protected $fillable = [ @@ -140,5 +139,4 @@ class CartRule extends Model implements CartRuleContract { return CartRuleFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/CartRule/src/Models/CartRuleCoupon.php b/packages/Webkul/CartRule/src/Models/CartRuleCoupon.php index 602424b46..767a4a36a 100644 --- a/packages/Webkul/CartRule/src/Models/CartRuleCoupon.php +++ b/packages/Webkul/CartRule/src/Models/CartRuleCoupon.php @@ -10,7 +10,6 @@ use Webkul\CartRule\Contracts\CartRuleCoupon as CartRuleCouponContract; class CartRuleCoupon extends Model implements CartRuleCouponContract { - use HasFactory; protected $fillable = [ @@ -41,5 +40,4 @@ class CartRuleCoupon extends Model implements CartRuleCouponContract { return CartRuleCouponFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Category/src/Database/Factories/CategoryFactory.php b/packages/Webkul/Category/src/Database/Factories/CategoryFactory.php index 414e8004a..6b8612e99 100644 --- a/packages/Webkul/Category/src/Database/Factories/CategoryFactory.php +++ b/packages/Webkul/Category/src/Database/Factories/CategoryFactory.php @@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class CategoryFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -60,5 +59,4 @@ class CategoryFactory extends Factory ]; }); } - } diff --git a/packages/Webkul/Category/src/Models/Category.php b/packages/Webkul/Category/src/Models/Category.php index 6bce836ea..894cc9d75 100755 --- a/packages/Webkul/Category/src/Models/Category.php +++ b/packages/Webkul/Category/src/Models/Category.php @@ -23,7 +23,6 @@ use Webkul\Product\Models\ProductProxy; */ class Category extends TranslatableModel implements CategoryContract { - use NodeTrait, HasFactory; public $translatedAttributes = [ @@ -171,5 +170,4 @@ class Category extends TranslatableModel implements CategoryContract { return CategoryFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Category/src/Providers/CategoryServiceProvider.php b/packages/Webkul/Category/src/Providers/CategoryServiceProvider.php index c4905e07c..b31a9a834 100755 --- a/packages/Webkul/Category/src/Providers/CategoryServiceProvider.php +++ b/packages/Webkul/Category/src/Providers/CategoryServiceProvider.php @@ -8,7 +8,6 @@ use Webkul\Category\Observers\CategoryObserver; class CategoryServiceProvider extends ServiceProvider { - /** * Bootstrap services. * @@ -16,9 +15,8 @@ class CategoryServiceProvider extends ServiceProvider */ public function boot(): void { - $this->loadMigrationsFrom(__DIR__.'/../Database/Migrations'); + $this->loadMigrationsFrom(__DIR__ . '/../Database/Migrations'); CategoryProxy::observe(CategoryObserver::class); } - } \ No newline at end of file diff --git a/packages/Webkul/Checkout/src/Database/Factories/CartAddressFactory.php b/packages/Webkul/Checkout/src/Database/Factories/CartAddressFactory.php index d83dcdf9a..cb179e9b0 100644 --- a/packages/Webkul/Checkout/src/Database/Factories/CartAddressFactory.php +++ b/packages/Webkul/Checkout/src/Database/Factories/CartAddressFactory.php @@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class CartAddressFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -29,5 +28,4 @@ class CartAddressFactory extends Factory 'address_type' => CartAddress::ADDRESS_TYPE_BILLING, ]; } - } diff --git a/packages/Webkul/Checkout/src/Database/Factories/CartFactory.php b/packages/Webkul/Checkout/src/Database/Factories/CartFactory.php index 7cc5c75a5..65e5f46b9 100644 --- a/packages/Webkul/Checkout/src/Database/Factories/CartFactory.php +++ b/packages/Webkul/Checkout/src/Database/Factories/CartFactory.php @@ -10,7 +10,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class CartFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -54,6 +53,5 @@ class CartFactory extends Factory 'updated_at' => $now, ]; } - } diff --git a/packages/Webkul/Checkout/src/Database/Factories/CartItemFactory.php b/packages/Webkul/Checkout/src/Database/Factories/CartItemFactory.php index c20838dd2..0ead5b1c4 100644 --- a/packages/Webkul/Checkout/src/Database/Factories/CartItemFactory.php +++ b/packages/Webkul/Checkout/src/Database/Factories/CartItemFactory.php @@ -10,7 +10,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class CartItemFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -53,5 +52,4 @@ class CartItemFactory extends Factory 'updated_at' => $now, ]; } - } diff --git a/packages/Webkul/Checkout/src/Database/Factories/CartPaymentFactory.php b/packages/Webkul/Checkout/src/Database/Factories/CartPaymentFactory.php index 692c3202f..62522f176 100644 --- a/packages/Webkul/Checkout/src/Database/Factories/CartPaymentFactory.php +++ b/packages/Webkul/Checkout/src/Database/Factories/CartPaymentFactory.php @@ -8,7 +8,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class CartPaymentFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -30,7 +29,6 @@ class CartPaymentFactory extends Factory 'updated_at' => $now, ]; } - } diff --git a/packages/Webkul/Checkout/src/Models/Cart.php b/packages/Webkul/Checkout/src/Models/Cart.php index f5960f31f..09f33b416 100755 --- a/packages/Webkul/Checkout/src/Models/Cart.php +++ b/packages/Webkul/Checkout/src/Models/Cart.php @@ -9,7 +9,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; class Cart extends Model implements CartContract { - use HasFactory; protected $table = 'cart'; @@ -193,9 +192,9 @@ class Cart extends Model implements CartContract */ public function checkMinimumOrder(): bool { - $minimumOrderAmount = (float) (core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0); + $minimumOrderAmount = (float)(core()->getConfigData('sales.orderSettings.minimum-order.minimum_order_amount') ?? 0); - $cartBaseSubTotal = (float) $this->base_sub_total; + $cartBaseSubTotal = (float)$this->base_sub_total; return $cartBaseSubTotal >= $minimumOrderAmount; } @@ -210,5 +209,4 @@ class Cart extends Model implements CartContract { return CartFactory::new(); } - } diff --git a/packages/Webkul/Checkout/src/Models/CartAddress.php b/packages/Webkul/Checkout/src/Models/CartAddress.php index e6f8aac00..c7b26bf47 100755 --- a/packages/Webkul/Checkout/src/Models/CartAddress.php +++ b/packages/Webkul/Checkout/src/Models/CartAddress.php @@ -21,7 +21,6 @@ use Webkul\Core\Models\Address; */ class CartAddress extends Address implements CartAddressContract { - use HasFactory; public const ADDRESS_TYPE_SHIPPING = 'cart_shipping'; @@ -77,5 +76,4 @@ class CartAddress extends Address implements CartAddressContract { return CartAddressFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Checkout/src/Models/CartItem.php b/packages/Webkul/Checkout/src/Models/CartItem.php index 6a092e6c3..f2da97ccb 100755 --- a/packages/Webkul/Checkout/src/Models/CartItem.php +++ b/packages/Webkul/Checkout/src/Models/CartItem.php @@ -15,7 +15,6 @@ use Webkul\Checkout\Contracts\CartItem as CartItemContract; class CartItem extends Model implements CartItemContract { - use HasFactory; protected $table = 'cart_items'; @@ -93,5 +92,4 @@ class CartItem extends Model implements CartItemContract { return CartItemFactory::new(); } - } diff --git a/packages/Webkul/Checkout/src/Models/CartPayment.php b/packages/Webkul/Checkout/src/Models/CartPayment.php index 68d2a10b7..f518fed58 100755 --- a/packages/Webkul/Checkout/src/Models/CartPayment.php +++ b/packages/Webkul/Checkout/src/Models/CartPayment.php @@ -9,7 +9,6 @@ use Webkul\Checkout\Contracts\CartPayment as CartPaymentContract; class CartPayment extends Model implements CartPaymentContract { - use HasFactory; protected $table = 'cart_payment'; @@ -23,5 +22,4 @@ class CartPayment extends Model implements CartPaymentContract { return CartPaymentFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Core/src/Database/Factories/CartRuleCouponFactory.php b/packages/Webkul/Core/src/Database/Factories/CartRuleCouponFactory.php index f4c71eff9..cbe42b6a1 100644 --- a/packages/Webkul/Core/src/Database/Factories/CartRuleCouponFactory.php +++ b/packages/Webkul/Core/src/Database/Factories/CartRuleCouponFactory.php @@ -9,7 +9,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class CartRuleCouponFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -33,5 +32,4 @@ class CartRuleCouponFactory extends Factory 'cart_rule_id' => CartRule::factory(), ]; } - } diff --git a/packages/Webkul/Core/src/Database/Factories/CartRuleFactory.php b/packages/Webkul/Core/src/Database/Factories/CartRuleFactory.php index da292f841..403654acf 100644 --- a/packages/Webkul/Core/src/Database/Factories/CartRuleFactory.php +++ b/packages/Webkul/Core/src/Database/Factories/CartRuleFactory.php @@ -8,7 +8,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class CartRuleFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -45,5 +44,4 @@ class CartRuleFactory extends Factory 'conditions' => null, ]; } - } \ No newline at end of file diff --git a/packages/Webkul/Core/src/Database/Factories/ChannelFactory.php b/packages/Webkul/Core/src/Database/Factories/ChannelFactory.php index e71bd75e2..ab6ab1574 100644 --- a/packages/Webkul/Core/src/Database/Factories/ChannelFactory.php +++ b/packages/Webkul/Core/src/Database/Factories/ChannelFactory.php @@ -11,7 +11,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class ChannelFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -46,5 +45,4 @@ class ChannelFactory extends Factory 'home_seo' => json_encode($seoData, JSON_THROW_ON_ERROR), ]; } - } \ No newline at end of file diff --git a/packages/Webkul/Core/src/Database/Factories/ChannelInventorySourceFactory.php b/packages/Webkul/Core/src/Database/Factories/ChannelInventorySourceFactory.php index 193a5b6f3..0ddce3c49 100644 --- a/packages/Webkul/Core/src/Database/Factories/ChannelInventorySourceFactory.php +++ b/packages/Webkul/Core/src/Database/Factories/ChannelInventorySourceFactory.php @@ -6,7 +6,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class ChannelInventorySourceFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -26,5 +25,4 @@ class ChannelInventorySourceFactory extends Factory 'inventory_source_id' => 1, ]; } - } diff --git a/packages/Webkul/Core/src/Database/Factories/CurrencyFactory.php b/packages/Webkul/Core/src/Database/Factories/CurrencyFactory.php index c5faa1b83..73bfc2c59 100644 --- a/packages/Webkul/Core/src/Database/Factories/CurrencyFactory.php +++ b/packages/Webkul/Core/src/Database/Factories/CurrencyFactory.php @@ -8,7 +8,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class CurrencyFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -28,5 +27,4 @@ class CurrencyFactory extends Factory 'name' => $this->faker->word, ]; } - } \ No newline at end of file diff --git a/packages/Webkul/Core/src/Database/Factories/LocaleFactory.php b/packages/Webkul/Core/src/Database/Factories/LocaleFactory.php index 7f740198f..251632861 100644 --- a/packages/Webkul/Core/src/Database/Factories/LocaleFactory.php +++ b/packages/Webkul/Core/src/Database/Factories/LocaleFactory.php @@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class LocaleFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -50,5 +49,4 @@ class LocaleFactory extends Factory ]; }); } - } \ No newline at end of file diff --git a/packages/Webkul/Core/src/Database/Factories/SubscriberListFactory.php b/packages/Webkul/Core/src/Database/Factories/SubscriberListFactory.php index 80f779824..8d13426a1 100644 --- a/packages/Webkul/Core/src/Database/Factories/SubscriberListFactory.php +++ b/packages/Webkul/Core/src/Database/Factories/SubscriberListFactory.php @@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class SubscriberListFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -28,6 +27,5 @@ class SubscriberListFactory extends Factory 'channel_id' => 1, ]; } - } diff --git a/packages/Webkul/Core/src/Models/Channel.php b/packages/Webkul/Core/src/Models/Channel.php index 7e7c08564..a3fd16e01 100755 --- a/packages/Webkul/Core/src/Models/Channel.php +++ b/packages/Webkul/Core/src/Models/Channel.php @@ -12,7 +12,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; class Channel extends TranslatableModel implements ChannelContract { - use HasFactory; protected $fillable = [ @@ -138,5 +137,4 @@ class Channel extends TranslatableModel implements ChannelContract { return ChannelFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Core/src/Models/Currency.php b/packages/Webkul/Core/src/Models/Currency.php index 16f9fe929..1e3db0e9d 100755 --- a/packages/Webkul/Core/src/Models/Currency.php +++ b/packages/Webkul/Core/src/Models/Currency.php @@ -10,7 +10,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; class Currency extends Model implements CurrencyContract { - use HasFactory; /** @@ -53,5 +52,4 @@ class Currency extends Model implements CurrencyContract { return CurrencyFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Core/src/Models/Locale.php b/packages/Webkul/Core/src/Models/Locale.php index 391e4cced..7814bdd94 100755 --- a/packages/Webkul/Core/src/Models/Locale.php +++ b/packages/Webkul/Core/src/Models/Locale.php @@ -9,7 +9,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; class Locale extends Model implements LocaleContract { - use HasFactory; /** @@ -32,5 +31,4 @@ class Locale extends Model implements LocaleContract { return LocaleFactory::new(); } - } diff --git a/packages/Webkul/Core/src/Models/SubscribersList.php b/packages/Webkul/Core/src/Models/SubscribersList.php index 21c8c3006..2cbbb7ef8 100755 --- a/packages/Webkul/Core/src/Models/SubscribersList.php +++ b/packages/Webkul/Core/src/Models/SubscribersList.php @@ -11,7 +11,6 @@ use Webkul\Core\Contracts\SubscribersList as SubscribersListContract; class SubscribersList extends Model implements SubscribersListContract { - use HasFactory; /** @@ -49,5 +48,4 @@ class SubscribersList extends Model implements SubscribersListContract { return SubscriberListFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Customer/src/Database/Factories/CustomerAddressFactory.php b/packages/Webkul/Customer/src/Database/Factories/CustomerAddressFactory.php index d148c5cd2..5b2e0e487 100644 --- a/packages/Webkul/Customer/src/Database/Factories/CustomerAddressFactory.php +++ b/packages/Webkul/Customer/src/Database/Factories/CustomerAddressFactory.php @@ -9,7 +9,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class CustomerAddressFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -46,7 +45,6 @@ class CustomerAddressFactory extends Factory 'address_type' => CustomerAddress::ADDRESS_TYPE, ]; } - } diff --git a/packages/Webkul/Customer/src/Database/Factories/CustomerFactory.php b/packages/Webkul/Customer/src/Database/Factories/CustomerFactory.php index 4e9689e90..cccfc9002 100644 --- a/packages/Webkul/Customer/src/Database/Factories/CustomerFactory.php +++ b/packages/Webkul/Customer/src/Database/Factories/CustomerFactory.php @@ -9,7 +9,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class CustomerFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -72,5 +71,4 @@ class CustomerFactory extends Factory ]; }); } - } diff --git a/packages/Webkul/Customer/src/Database/Factories/CustomerGroupFactory.php b/packages/Webkul/Customer/src/Database/Factories/CustomerGroupFactory.php index 012ae252b..5fc1bf625 100644 --- a/packages/Webkul/Customer/src/Database/Factories/CustomerGroupFactory.php +++ b/packages/Webkul/Customer/src/Database/Factories/CustomerGroupFactory.php @@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class CustomerGroupFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -31,5 +30,4 @@ class CustomerGroupFactory extends Factory 'code' => lcfirst($name), ]; } - } \ No newline at end of file diff --git a/packages/Webkul/Customer/src/Models/Customer.php b/packages/Webkul/Customer/src/Models/Customer.php index 26876658e..e06f18e66 100755 --- a/packages/Webkul/Customer/src/Models/Customer.php +++ b/packages/Webkul/Customer/src/Models/Customer.php @@ -20,7 +20,6 @@ use Webkul\Customer\Database\Factories\CustomerAddressFactory; class Customer extends Authenticatable implements CustomerContract, JWTSubject { - use Notifiable, HasFactory; protected $table = 'customers'; @@ -53,7 +52,7 @@ class Customer extends Authenticatable implements CustomerContract, JWTSubject */ public function getNameAttribute(): string { - return ucfirst($this->first_name).' '.ucfirst($this->last_name); + return ucfirst($this->first_name) . ' ' . ucfirst($this->last_name); } /** @@ -194,5 +193,4 @@ class Customer extends Authenticatable implements CustomerContract, JWTSubject { return CustomerFactory::new(); } - } diff --git a/packages/Webkul/Customer/src/Models/CustomerAddress.php b/packages/Webkul/Customer/src/Models/CustomerAddress.php index 19857cd6b..e84eb6ee3 100755 --- a/packages/Webkul/Customer/src/Models/CustomerAddress.php +++ b/packages/Webkul/Customer/src/Models/CustomerAddress.php @@ -10,7 +10,6 @@ use Webkul\Customer\Contracts\CustomerAddress as CustomerAddressContract; class CustomerAddress extends Address implements CustomerAddressContract { - use HasFactory; public const ADDRESS_TYPE = 'customer'; @@ -45,5 +44,4 @@ class CustomerAddress extends Address implements CustomerAddressContract { return CustomerAddressFactory::new(); } - } diff --git a/packages/Webkul/Customer/src/Models/CustomerGroup.php b/packages/Webkul/Customer/src/Models/CustomerGroup.php index 8ce906b11..87a0ef940 100755 --- a/packages/Webkul/Customer/src/Models/CustomerGroup.php +++ b/packages/Webkul/Customer/src/Models/CustomerGroup.php @@ -9,7 +9,6 @@ use Webkul\Customer\Contracts\CustomerGroup as CustomerGroupContract; class CustomerGroup extends Model implements CustomerGroupContract { - use HasFactory; protected $table = 'customer_groups'; @@ -37,5 +36,4 @@ class CustomerGroup extends Model implements CustomerGroupContract { return CustomerGroupFactory::new(); } - } diff --git a/packages/Webkul/Inventory/src/Database/Factories/InventorySourceFactory.php b/packages/Webkul/Inventory/src/Database/Factories/InventorySourceFactory.php index 58d36d07c..74d5ee111 100644 --- a/packages/Webkul/Inventory/src/Database/Factories/InventorySourceFactory.php +++ b/packages/Webkul/Inventory/src/Database/Factories/InventorySourceFactory.php @@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class InventorySourceFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -42,5 +41,4 @@ class InventorySourceFactory extends Factory 'updated_at' => $now, ]; } - } diff --git a/packages/Webkul/Inventory/src/Models/InventorySource.php b/packages/Webkul/Inventory/src/Models/InventorySource.php index 222b3bb1a..05834f972 100755 --- a/packages/Webkul/Inventory/src/Models/InventorySource.php +++ b/packages/Webkul/Inventory/src/Models/InventorySource.php @@ -9,7 +9,6 @@ use Webkul\Inventory\Contracts\InventorySource as InventorySourceContract; class InventorySource extends Model implements InventorySourceContract { - use HasFactory; protected $guarded = ['_token']; @@ -23,5 +22,4 @@ class InventorySource extends Model implements InventorySourceContract { return InventorySourceFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Database/Factories/ProductAttributeValueFactory.php b/packages/Webkul/Product/src/Database/Factories/ProductAttributeValueFactory.php index 8e494d75f..3b0737799 100644 --- a/packages/Webkul/Product/src/Database/Factories/ProductAttributeValueFactory.php +++ b/packages/Webkul/Product/src/Database/Factories/ProductAttributeValueFactory.php @@ -8,7 +8,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class ProductAttributeValueFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -29,5 +28,4 @@ class ProductAttributeValueFactory extends Factory 'channel' => 'default', ]; } - } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Database/Factories/ProductDownloadableLinkFactory.php b/packages/Webkul/Product/src/Database/Factories/ProductDownloadableLinkFactory.php index 4ddcf862e..9d29062b1 100644 --- a/packages/Webkul/Product/src/Database/Factories/ProductDownloadableLinkFactory.php +++ b/packages/Webkul/Product/src/Database/Factories/ProductDownloadableLinkFactory.php @@ -8,7 +8,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class ProductDownloadableLinkFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -29,7 +28,7 @@ class ProductDownloadableLinkFactory extends Factory return [ 'url' => '', - 'file' => $filepath.$filename, + 'file' => $filepath . $filename, 'file_name' => $filename, 'type' => 'file', 'price' => 0.0000, @@ -39,5 +38,4 @@ class ProductDownloadableLinkFactory extends Factory 'updated_at' => $now, ]; } - } diff --git a/packages/Webkul/Product/src/Database/Factories/ProductDownloadableLinkTranslationFactory.php b/packages/Webkul/Product/src/Database/Factories/ProductDownloadableLinkTranslationFactory.php index bb1b71c83..c42c64a29 100644 --- a/packages/Webkul/Product/src/Database/Factories/ProductDownloadableLinkTranslationFactory.php +++ b/packages/Webkul/Product/src/Database/Factories/ProductDownloadableLinkTranslationFactory.php @@ -8,7 +8,6 @@ use Webkul\Product\Models\ProductDownloadableLinkTranslation; class ProductDownloadableLinkTranslationFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -29,5 +28,4 @@ class ProductDownloadableLinkTranslationFactory extends Factory 'product_downloadable_link_id' => ProductDownloadableLink::factory(), ]; } - } diff --git a/packages/Webkul/Product/src/Database/Factories/ProductFactory.php b/packages/Webkul/Product/src/Database/Factories/ProductFactory.php index 51a355564..fde6b3bcb 100644 --- a/packages/Webkul/Product/src/Database/Factories/ProductFactory.php +++ b/packages/Webkul/Product/src/Database/Factories/ProductFactory.php @@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class ProductFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -73,5 +72,4 @@ class ProductFactory extends Factory ]; }); } - } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Database/Factories/ProductInventoryFactory.php b/packages/Webkul/Product/src/Database/Factories/ProductInventoryFactory.php index d6dfd4a88..b39a2c7c2 100644 --- a/packages/Webkul/Product/src/Database/Factories/ProductInventoryFactory.php +++ b/packages/Webkul/Product/src/Database/Factories/ProductInventoryFactory.php @@ -9,7 +9,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class ProductInventoryFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -30,5 +29,4 @@ class ProductInventoryFactory extends Factory 'inventory_source_id' => InventorySource::factory(), ]; } - } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Database/Factories/ProductReviewFactory.php b/packages/Webkul/Product/src/Database/Factories/ProductReviewFactory.php index 7be9cd047..c19bf3844 100644 --- a/packages/Webkul/Product/src/Database/Factories/ProductReviewFactory.php +++ b/packages/Webkul/Product/src/Database/Factories/ProductReviewFactory.php @@ -8,7 +8,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class ProductReviewFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -31,5 +30,4 @@ class ProductReviewFactory extends Factory 'product_id' => Product::factory(), ]; } - } diff --git a/packages/Webkul/Product/src/Models/Product.php b/packages/Webkul/Product/src/Models/Product.php index ecfaf48eb..640aa0e1f 100755 --- a/packages/Webkul/Product/src/Models/Product.php +++ b/packages/Webkul/Product/src/Models/Product.php @@ -21,7 +21,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany; class Product extends Model implements ProductContract { - use HasFactory; /** @@ -301,7 +300,7 @@ class Product extends Model implements ProductContract return $this->typeInstance; } - $this->typeInstance = app(config('product_types.'.$this->type.'.class')); + $this->typeInstance = app(config('product_types.' . $this->type . '.class')); if (!$this->typeInstance instanceof AbstractType) { throw new Exception("Please ensure the product type '{$this->type}' is configured in your application."); @@ -540,5 +539,4 @@ class Product extends Model implements ProductContract { return ProductFactory::new(); } - } diff --git a/packages/Webkul/Product/src/Models/ProductAttributeValue.php b/packages/Webkul/Product/src/Models/ProductAttributeValue.php index 67ec1cb2b..417c503dd 100755 --- a/packages/Webkul/Product/src/Models/ProductAttributeValue.php +++ b/packages/Webkul/Product/src/Models/ProductAttributeValue.php @@ -11,7 +11,6 @@ use Webkul\Product\Contracts\ProductAttributeValue as ProductAttributeValueContr class ProductAttributeValue extends Model implements ProductAttributeValueContract { - use HasFactory; /** @@ -84,5 +83,4 @@ class ProductAttributeValue extends Model implements ProductAttributeValueContra { return ProductAttributeValueFactory::new(); } - } diff --git a/packages/Webkul/Product/src/Models/ProductDownloadableLink.php b/packages/Webkul/Product/src/Models/ProductDownloadableLink.php index ce1ae4e85..c02abc644 100644 --- a/packages/Webkul/Product/src/Models/ProductDownloadableLink.php +++ b/packages/Webkul/Product/src/Models/ProductDownloadableLink.php @@ -10,7 +10,6 @@ use Webkul\Product\Contracts\ProductDownloadableLink as ProductDownloadableLinkC class ProductDownloadableLink extends TranslatableModel implements ProductDownloadableLinkContract { - use HasFactory; public $translatedAttributes = ['title']; @@ -100,5 +99,4 @@ class ProductDownloadableLink extends TranslatableModel implements ProductDownlo { return ProductDownloadableLinkFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Models/ProductDownloadableLinkTranslation.php b/packages/Webkul/Product/src/Models/ProductDownloadableLinkTranslation.php index e4fa4f764..f630413dd 100644 --- a/packages/Webkul/Product/src/Models/ProductDownloadableLinkTranslation.php +++ b/packages/Webkul/Product/src/Models/ProductDownloadableLinkTranslation.php @@ -9,7 +9,6 @@ use Webkul\Product\Contracts\ProductDownloadableLinkTranslation as ProductDownlo class ProductDownloadableLinkTranslation extends Model implements ProductDownloadableLinkTranslationContract { - use HasFactory; public $timestamps = false; @@ -25,5 +24,4 @@ class ProductDownloadableLinkTranslation extends Model implements ProductDownloa { return ProductDownloadableLinkTranslationFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Models/ProductInventory.php b/packages/Webkul/Product/src/Models/ProductInventory.php index faa86ffeb..9ab93a449 100755 --- a/packages/Webkul/Product/src/Models/ProductInventory.php +++ b/packages/Webkul/Product/src/Models/ProductInventory.php @@ -11,7 +11,6 @@ use Webkul\Product\Contracts\ProductInventory as ProductInventoryContract; class ProductInventory extends Model implements ProductInventoryContract { - use HasFactory; public $timestamps = false; @@ -48,5 +47,4 @@ class ProductInventory extends Model implements ProductInventoryContract { return ProductInventoryFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Product/src/Models/ProductReview.php b/packages/Webkul/Product/src/Models/ProductReview.php index becccc86b..70ee1b239 100755 --- a/packages/Webkul/Product/src/Models/ProductReview.php +++ b/packages/Webkul/Product/src/Models/ProductReview.php @@ -4,7 +4,6 @@ namespace Webkul\Product\Models; use Illuminate\Database\Eloquent\Model; use Webkul\Customer\Models\CustomerProxy; -use Webkul\Product\Models\Product; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Factories\HasFactory; @@ -13,7 +12,6 @@ use Webkul\Product\Contracts\ProductReview as ProductReviewContract; class ProductReview extends Model implements ProductReviewContract { - use HasFactory; protected $fillable = [ @@ -59,5 +57,4 @@ class ProductReview extends Model implements ProductReviewContract { return ProductReviewFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Sales/src/Database/Factories/InvoiceFactory.php b/packages/Webkul/Sales/src/Database/Factories/InvoiceFactory.php index 1dbb3fbcb..d37f6ef59 100644 --- a/packages/Webkul/Sales/src/Database/Factories/InvoiceFactory.php +++ b/packages/Webkul/Sales/src/Database/Factories/InvoiceFactory.php @@ -9,7 +9,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class InvoiceFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -92,5 +91,4 @@ class InvoiceFactory extends Factory ]; }); } - } \ No newline at end of file diff --git a/packages/Webkul/Sales/src/Database/Factories/InvoiceItemFactory.php b/packages/Webkul/Sales/src/Database/Factories/InvoiceItemFactory.php index 8895d6e33..608e9d533 100644 --- a/packages/Webkul/Sales/src/Database/Factories/InvoiceItemFactory.php +++ b/packages/Webkul/Sales/src/Database/Factories/InvoiceItemFactory.php @@ -9,7 +9,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class InvoiceItemFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -50,5 +49,4 @@ class InvoiceItemFactory extends Factory 'invoice_id' => Invoice::factory(), ]; } - } diff --git a/packages/Webkul/Sales/src/Database/Factories/OrderAddressFactory.php b/packages/Webkul/Sales/src/Database/Factories/OrderAddressFactory.php index e2e91c02e..905343cec 100644 --- a/packages/Webkul/Sales/src/Database/Factories/OrderAddressFactory.php +++ b/packages/Webkul/Sales/src/Database/Factories/OrderAddressFactory.php @@ -10,7 +10,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class OrderAddressFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -60,5 +59,4 @@ class OrderAddressFactory extends Factory ]; }); } - } \ No newline at end of file diff --git a/packages/Webkul/Sales/src/Database/Factories/OrderFactory.php b/packages/Webkul/Sales/src/Database/Factories/OrderFactory.php index 5956bbabc..26dbf6ef2 100644 --- a/packages/Webkul/Sales/src/Database/Factories/OrderFactory.php +++ b/packages/Webkul/Sales/src/Database/Factories/OrderFactory.php @@ -10,7 +10,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class OrderFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -105,5 +104,4 @@ class OrderFactory extends Factory ]; }); } - } diff --git a/packages/Webkul/Sales/src/Database/Factories/OrderItemFactory.php b/packages/Webkul/Sales/src/Database/Factories/OrderItemFactory.php index 4520630c3..129106ac9 100644 --- a/packages/Webkul/Sales/src/Database/Factories/OrderItemFactory.php +++ b/packages/Webkul/Sales/src/Database/Factories/OrderItemFactory.php @@ -9,7 +9,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class OrderItemFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -59,5 +58,4 @@ class OrderItemFactory extends Factory 'product_type' => Product::class, ]; } - } \ No newline at end of file diff --git a/packages/Webkul/Sales/src/Database/Factories/OrderPaymentFactory.php b/packages/Webkul/Sales/src/Database/Factories/OrderPaymentFactory.php index a0be980ef..cd462a993 100644 --- a/packages/Webkul/Sales/src/Database/Factories/OrderPaymentFactory.php +++ b/packages/Webkul/Sales/src/Database/Factories/OrderPaymentFactory.php @@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class OrderPaymentFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -26,6 +25,5 @@ class OrderPaymentFactory extends Factory 'method' => 'cashondelivery', ]; } - } diff --git a/packages/Webkul/Sales/src/Database/Factories/RefundFactory.php b/packages/Webkul/Sales/src/Database/Factories/RefundFactory.php index 4dfd66300..aebee283a 100644 --- a/packages/Webkul/Sales/src/Database/Factories/RefundFactory.php +++ b/packages/Webkul/Sales/src/Database/Factories/RefundFactory.php @@ -8,7 +8,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class RefundFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -27,6 +26,5 @@ class RefundFactory extends Factory 'order_id' => Order::factory(), ]; } - } diff --git a/packages/Webkul/Sales/src/Database/Factories/ShipmentFactory.php b/packages/Webkul/Sales/src/Database/Factories/ShipmentFactory.php index 339e7b99a..d59b66c40 100644 --- a/packages/Webkul/Sales/src/Database/Factories/ShipmentFactory.php +++ b/packages/Webkul/Sales/src/Database/Factories/ShipmentFactory.php @@ -9,7 +9,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class ShipmentFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -34,6 +33,5 @@ class ShipmentFactory extends Factory 'inventory_source_id' => InventorySource::factory(), ]; } - } diff --git a/packages/Webkul/Sales/src/Models/Invoice.php b/packages/Webkul/Sales/src/Models/Invoice.php index 7e71f59ed..98c6226ab 100755 --- a/packages/Webkul/Sales/src/Models/Invoice.php +++ b/packages/Webkul/Sales/src/Models/Invoice.php @@ -13,7 +13,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; class Invoice extends Model implements InvoiceContract { - use PaymentTerm, HasFactory; /** @@ -97,5 +96,4 @@ class Invoice extends Model implements InvoiceContract { return InvoiceFactory::new(); } - } diff --git a/packages/Webkul/Sales/src/Models/InvoiceItem.php b/packages/Webkul/Sales/src/Models/InvoiceItem.php index de39941f0..9d7c26ff0 100755 --- a/packages/Webkul/Sales/src/Models/InvoiceItem.php +++ b/packages/Webkul/Sales/src/Models/InvoiceItem.php @@ -14,7 +14,6 @@ use Webkul\Sales\Contracts\InvoiceItem as InvoiceItemContract; class InvoiceItem extends Model implements InvoiceItemContract { - use HasFactory; protected $guarded = [ @@ -94,5 +93,4 @@ class InvoiceItem extends Model implements InvoiceItemContract { return InvoiceItemFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Sales/src/Models/Order.php b/packages/Webkul/Sales/src/Models/Order.php index 21687144b..13b58b7b3 100755 --- a/packages/Webkul/Sales/src/Models/Order.php +++ b/packages/Webkul/Sales/src/Models/Order.php @@ -10,7 +10,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; class Order extends Model implements OrderContract { - use HasFactory; public const STATUS_PENDING = 'pending'; @@ -54,7 +53,7 @@ class Order extends Model implements OrderContract */ public function getCustomerFullNameAttribute(): string { - return $this->customer_first_name.' '.$this->customer_last_name; + return $this->customer_first_name . ' ' . $this->customer_last_name; } /** @@ -345,5 +344,4 @@ class Order extends Model implements OrderContract { return OrderFactory::new(); } - } diff --git a/packages/Webkul/Sales/src/Models/OrderAddress.php b/packages/Webkul/Sales/src/Models/OrderAddress.php index 4358a764d..6ba8197d5 100755 --- a/packages/Webkul/Sales/src/Models/OrderAddress.php +++ b/packages/Webkul/Sales/src/Models/OrderAddress.php @@ -21,7 +21,6 @@ use Illuminate\Database\Eloquent\Builder; */ class OrderAddress extends Address implements OrderAddressContract { - use HasFactory; public const ADDRESS_TYPE_SHIPPING = 'order_shipping'; @@ -80,5 +79,4 @@ class OrderAddress extends Address implements OrderAddressContract { return OrderAddressFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Sales/src/Models/OrderItem.php b/packages/Webkul/Sales/src/Models/OrderItem.php index 5c43f37cb..8593d738a 100755 --- a/packages/Webkul/Sales/src/Models/OrderItem.php +++ b/packages/Webkul/Sales/src/Models/OrderItem.php @@ -14,7 +14,6 @@ use Webkul\Sales\Contracts\OrderItem as OrderItemContract; class OrderItem extends Model implements OrderItemContract { - use HasFactory; protected $guarded = [ @@ -233,5 +232,4 @@ class OrderItem extends Model implements OrderItemContract { return OrderItemFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Sales/src/Models/OrderPayment.php b/packages/Webkul/Sales/src/Models/OrderPayment.php index 34eedb442..495013e1e 100755 --- a/packages/Webkul/Sales/src/Models/OrderPayment.php +++ b/packages/Webkul/Sales/src/Models/OrderPayment.php @@ -9,7 +9,6 @@ use Webkul\Sales\Contracts\OrderPayment as OrderPaymentContract; class OrderPayment extends Model implements OrderPaymentContract { - use HasFactory; protected $table = 'order_payment'; @@ -33,5 +32,4 @@ class OrderPayment extends Model implements OrderPaymentContract { return OrderPaymentFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Sales/src/Models/Refund.php b/packages/Webkul/Sales/src/Models/Refund.php index 645cc60ef..d40142607 100644 --- a/packages/Webkul/Sales/src/Models/Refund.php +++ b/packages/Webkul/Sales/src/Models/Refund.php @@ -12,7 +12,6 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; class Refund extends Model implements RefundContract { - use HasFactory; protected $guarded = [ @@ -81,5 +80,4 @@ class Refund extends Model implements RefundContract { return RefundFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Sales/src/Models/Shipment.php b/packages/Webkul/Sales/src/Models/Shipment.php index 942060a3d..cf8233ec6 100755 --- a/packages/Webkul/Sales/src/Models/Shipment.php +++ b/packages/Webkul/Sales/src/Models/Shipment.php @@ -13,7 +13,6 @@ use Webkul\Sales\Contracts\Shipment as ShipmentContract; class Shipment extends Model implements ShipmentContract { - use HasFactory; protected $guarded = [ @@ -72,5 +71,4 @@ class Shipment extends Model implements ShipmentContract { return ShipmentFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Tax/src/Database/Factories/TaxCategoryFactory.php b/packages/Webkul/Tax/src/Database/Factories/TaxCategoryFactory.php index 2078f7398..d185fc25d 100644 --- a/packages/Webkul/Tax/src/Database/Factories/TaxCategoryFactory.php +++ b/packages/Webkul/Tax/src/Database/Factories/TaxCategoryFactory.php @@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class TaxCategoryFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -28,5 +27,4 @@ class TaxCategoryFactory extends Factory 'description' => $this->faker->sentence(10), ]; } - } \ No newline at end of file diff --git a/packages/Webkul/Tax/src/Database/Factories/TaxMapFactory.php b/packages/Webkul/Tax/src/Database/Factories/TaxMapFactory.php index bd90e0300..de5de85e4 100644 --- a/packages/Webkul/Tax/src/Database/Factories/TaxMapFactory.php +++ b/packages/Webkul/Tax/src/Database/Factories/TaxMapFactory.php @@ -9,7 +9,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class TaxMapFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -29,6 +28,5 @@ class TaxMapFactory extends Factory 'tax_rate_id' => TaxRate::factory(), ]; } - } diff --git a/packages/Webkul/Tax/src/Database/Factories/TaxRateFactory.php b/packages/Webkul/Tax/src/Database/Factories/TaxRateFactory.php index 0008f14a4..5231cdae3 100644 --- a/packages/Webkul/Tax/src/Database/Factories/TaxRateFactory.php +++ b/packages/Webkul/Tax/src/Database/Factories/TaxRateFactory.php @@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Factories\Factory; class TaxRateFactory extends Factory { - /** * The name of the factory's corresponding model. * @@ -33,5 +32,4 @@ class TaxRateFactory extends Factory 'tax_rate' => $this->faker->randomFloat(2, 3, 25), ]; } - } \ No newline at end of file diff --git a/packages/Webkul/Tax/src/Models/TaxCategory.php b/packages/Webkul/Tax/src/Models/TaxCategory.php index e2984ecf9..7ef065252 100755 --- a/packages/Webkul/Tax/src/Models/TaxCategory.php +++ b/packages/Webkul/Tax/src/Models/TaxCategory.php @@ -10,7 +10,6 @@ use Webkul\Tax\Contracts\TaxCategory as TaxCategoryContract; class TaxCategory extends Model implements TaxCategoryContract { - use HasFactory; /** @@ -43,5 +42,4 @@ class TaxCategory extends Model implements TaxCategoryContract { return TaxCategoryFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Tax/src/Models/TaxMap.php b/packages/Webkul/Tax/src/Models/TaxMap.php index f1aeda2f9..650e6c07b 100755 --- a/packages/Webkul/Tax/src/Models/TaxMap.php +++ b/packages/Webkul/Tax/src/Models/TaxMap.php @@ -3,8 +3,6 @@ namespace Webkul\Tax\Models; use Illuminate\Database\Eloquent\Model; -use Webkul\Tax\Models\TaxCategory; -use Webkul\Tax\Models\TaxRate; use Webkul\Tax\Database\Factories\TaxMapFactory; use Webkul\Tax\Contracts\TaxMap as TaxMapContract; use Illuminate\Database\Eloquent\Factories\HasFactory; @@ -35,5 +33,4 @@ class TaxMap extends Model implements TaxMapContract { return TaxMapFactory::new(); } - } \ No newline at end of file diff --git a/packages/Webkul/Tax/src/Models/TaxRate.php b/packages/Webkul/Tax/src/Models/TaxRate.php index b3a8fdb0d..4e4b34b41 100755 --- a/packages/Webkul/Tax/src/Models/TaxRate.php +++ b/packages/Webkul/Tax/src/Models/TaxRate.php @@ -3,7 +3,6 @@ namespace Webkul\Tax\Models; use Illuminate\Database\Eloquent\Model; -use Webkul\Tax\Models\TaxCategory; use Webkul\Tax\Database\Factories\TaxRateFactory; use Webkul\Tax\Contracts\TaxRate as TaxRateContract; use Illuminate\Database\Eloquent\Factories\HasFactory; @@ -12,6 +11,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany; class TaxRate extends Model implements TaxRateContract { use HasFactory; + /** * The attributes that are mass assignable. * @@ -45,5 +45,4 @@ class TaxRate extends Model implements TaxRateContract { return TaxRateFactory::new(); } - } \ No newline at end of file