Skip to content

Commit

Permalink
merge contracts
Browse files Browse the repository at this point in the history
  • Loading branch information
iamgergo committed Mar 28, 2021
1 parent 4f99e9f commit feb5b76
Show file tree
Hide file tree
Showing 16 changed files with 30 additions and 29 deletions.
3 changes: 2 additions & 1 deletion src/Contracts/Models/Address.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

namespace Bazar\Contracts\Models;

use Bazar\Contracts\Breadcrumbable;
use Illuminate\Database\Eloquent\Relations\MorphTo;

interface Address
interface Address extends Breadcrumbable
{
/**
* Get the addressable model for the address.
Expand Down
5 changes: 4 additions & 1 deletion src/Contracts/Models/Cart.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@

namespace Bazar\Contracts\Models;

interface Cart
use Bazar\Contracts\Discountable;
use Bazar\Contracts\Itemable;

interface Cart extends Discountable, Itemable
{
/**
* Lock the cart.
Expand Down
3 changes: 2 additions & 1 deletion src/Contracts/Models/Category.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

namespace Bazar\Contracts\Models;

use Bazar\Contracts\Breadcrumbable;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;

interface Category
interface Category extends Breadcrumbable
{
/**
* Get the products for the category.
Expand Down
5 changes: 4 additions & 1 deletion src/Contracts/Models/Order.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@

namespace Bazar\Contracts\Models;

use Bazar\Contracts\Breadcrumbable;
use Bazar\Contracts\Discountable;
use Bazar\Contracts\Itemable;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Support\Collection;

interface Order
interface Order extends Breadcrumbable, Discountable, Itemable
{
/**
* Get the transactions for the order.
Expand Down
4 changes: 3 additions & 1 deletion src/Contracts/Models/Product.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@

namespace Bazar\Contracts\Models;

use Bazar\Contracts\Breadcrumbable;
use Bazar\Contracts\Stockable;
use Bazar\Models\Variant;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\MorphToMany;
use Illuminate\Support\Collection;

interface Product
interface Product extends Breadcrumbable, Stockable
{
/**
* Get the orders for the product.
Expand Down
3 changes: 2 additions & 1 deletion src/Contracts/Models/Shipping.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

namespace Bazar\Contracts\Models;

use Bazar\Contracts\Taxable;
use Illuminate\Database\Eloquent\Relations\MorphTo;

interface Shipping
interface Shipping extends Taxable
{
/**
* Get the shippable model for the shipping.
Expand Down
3 changes: 2 additions & 1 deletion src/Contracts/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@

namespace Bazar\Contracts\Models;

use Bazar\Contracts\Breadcrumbable;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Database\Eloquent\Relations\MorphMany;

interface User
interface User extends Breadcrumbable
{
/**
* Get the cart for the user.
Expand Down
4 changes: 3 additions & 1 deletion src/Contracts/Models/Variant.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

namespace Bazar\Contracts\Models;

use Bazar\Contracts\Breadcrumbable;
use Bazar\Contracts\Stockable;
use Illuminate\Database\Eloquent\Relations\BelongsTo;

interface Variant
interface Variant extends Breadcrumbable, Stockable
{
/**
* Get the product for the transaction.
Expand Down
3 changes: 1 addition & 2 deletions src/Models/Address.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@
use Bazar\Concerns\BazarRoutable;
use Bazar\Concerns\Filterable;
use Bazar\Concerns\InteractsWithProxy;
use Bazar\Contracts\Breadcrumbable;
use Bazar\Contracts\Models\Address as Contract;
use Bazar\Support\Countries;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\MorphTo;
use Illuminate\Http\Request;

class Address extends Model implements Breadcrumbable, Contract
class Address extends Model implements Contract
{
use BazarRoutable, Filterable, InteractsWithProxy;

Expand Down
4 changes: 1 addition & 3 deletions src/Models/Cart.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@
use Bazar\Concerns\InteractsWithDiscounts;
use Bazar\Concerns\InteractsWithItems;
use Bazar\Concerns\InteractsWithProxy;
use Bazar\Contracts\Discountable;
use Bazar\Contracts\Itemable;
use Bazar\Contracts\Models\Cart as Contract;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Carbon;

class Cart extends Model implements Contract, Discountable, Itemable
class Cart extends Model implements Contract
{
use Addressable, HasUuid, InteractsWithDiscounts, InteractsWithItems, InteractsWithProxy;

Expand Down
3 changes: 1 addition & 2 deletions src/Models/Category.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@
use Bazar\Concerns\HasMedia;
use Bazar\Concerns\InteractsWithProxy;
use Bazar\Concerns\Sluggable;
use Bazar\Contracts\Breadcrumbable;
use Bazar\Contracts\Models\Category as Contract;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Http\Request;

class Category extends Model implements Breadcrumbable, Contract
class Category extends Model implements Contract
{
use BazarRoutable, Filterable, HasMedia, InteractsWithProxy, Sluggable, SoftDeletes;

Expand Down
5 changes: 1 addition & 4 deletions src/Models/Order.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
use Bazar\Concerns\InteractsWithDiscounts;
use Bazar\Concerns\InteractsWithItems;
use Bazar\Concerns\InteractsWithProxy;
use Bazar\Contracts\Breadcrumbable;
use Bazar\Contracts\Discountable;
use Bazar\Contracts\Itemable;
use Bazar\Contracts\Models\Order as Contract;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
Expand All @@ -20,7 +17,7 @@
use Illuminate\Http\Request;
use Illuminate\Support\Collection;

class Order extends Model implements Breadcrumbable, Contract, Discountable, Itemable
class Order extends Model implements Contract
{
use Addressable, BazarRoutable, Filterable, InteractsWithDiscounts, InteractsWithItems, InteractsWithProxy, SoftDeletes;

Expand Down
4 changes: 1 addition & 3 deletions src/Models/Product.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@
use Bazar\Concerns\InteractsWithProxy;
use Bazar\Concerns\InteractsWithStock;
use Bazar\Concerns\Sluggable;
use Bazar\Contracts\Breadcrumbable;
use Bazar\Contracts\Models\Product as Contract;
use Bazar\Contracts\Stockable;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
Expand All @@ -23,7 +21,7 @@
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Route;

class Product extends Model implements Breadcrumbable, Contract, Stockable
class Product extends Model implements Contract
{
use BazarRoutable, Filterable, InteractsWithProxy, InteractsWithStock, HasMedia, Sluggable, SoftDeletes;

Expand Down
3 changes: 1 addition & 2 deletions src/Models/Shipping.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@
use Bazar\Concerns\InteractsWithProxy;
use Bazar\Concerns\InteractsWithTaxes;
use Bazar\Contracts\Models\Shipping as Contract;
use Bazar\Contracts\Taxable;
use Bazar\Support\Facades\Shipping as Manager;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\MorphTo;
use Illuminate\Support\Str;
use Throwable;

class Shipping extends Model implements Contract, Taxable
class Shipping extends Model implements Contract
{
use Addressable, InteractsWithProxy, InteractsWithTaxes;

Expand Down
3 changes: 1 addition & 2 deletions src/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use Bazar\Concerns\BazarRoutable;
use Bazar\Concerns\Filterable;
use Bazar\Concerns\InteractsWithProxy;
use Bazar\Contracts\Breadcrumbable;
use Bazar\Contracts\Models\User as Contract;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Database\Eloquent\Builder;
Expand All @@ -21,7 +20,7 @@
use Illuminate\Support\Facades\URL;
use Illuminate\Support\Str;

class User extends Authenticatable implements Breadcrumbable, Contract, MustVerifyEmail
class User extends Authenticatable implements Contract, MustVerifyEmail
{
use BazarRoutable, Filterable, InteractsWithProxy, Notifiable, SoftDeletes;

Expand Down
4 changes: 1 addition & 3 deletions src/Models/Variant.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,14 @@
use Bazar\Concerns\HasMedia;
use Bazar\Concerns\InteractsWithProxy;
use Bazar\Concerns\InteractsWithStock;
use Bazar\Contracts\Breadcrumbable;
use Bazar\Contracts\Models\Variant as Contract;
use Bazar\Contracts\Stockable;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Http\Request;

class Variant extends Model implements Breadcrumbable, Contract, Stockable
class Variant extends Model implements Contract
{
use BazarRoutable, Filterable, InteractsWithProxy, InteractsWithStock, HasMedia, SoftDeletes;

Expand Down

0 comments on commit feb5b76

Please sign in to comment.