jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coding style

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2023-09-13 22:53:37 +02:00
parent 69478e3c74
commit 53feef282f
52 changed files with 122 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Datatables/Admin/Shop/TariffUnitiesDataTable.php
View File

@@ -2,9 +2,9 @@
namespace App\Datatables\Admin\Shop;
use Yajra\DataTables\Html\Column;
use App\Datatables\ParentDataTable as DataTable;
use App\Models\Shop\TariffUnity;
use Yajra\DataTables\Html\Column;
class TariffUnitiesDataTable extends DataTable
{

4
app/Datatables/ParentDataTable.php
View File

@@ -215,10 +215,8 @@ class ParentDataTable extends DataTable
/**
* Get filename for export.
*
* @return string
*/
protected function filename()
protected function filename(): string
{
return self::buildFilename($this->model_name);
}

1
app/Datatables/Shop/CustomerOrdersDataTable.php
View File

@@ -23,7 +23,6 @@ class CustomerOrdersDataTable extends DataTable
$this->url = route('Shop.Orders.index');
}
public function query(Order $model)
{
$customerId = Auth::id();

1
app/Http/Controllers/Admin/Core/Controller.php
View File

@@ -1,4 +1,5 @@
<?php
namespace App\Http\Controllers\Admin\Core;
use App\Http\Controllers\Controller as ParentController;

1
app/Http/Controllers/Admin/HomeController.php
View File

@@ -19,6 +19,7 @@ class HomeController extends Controller
$start = $request->input('start');
$end = $request->input('end');
$data = Dashboards::getStats($start, $end);
// dump($data);
return view('Admin.Shop.Dashboard.index', $data);
}

1
app/Http/Controllers/Admin/Shop/DeliveryPackageController.php
View File

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Admin\Shop;
use App\Datatables\Admin\Shop\DeliveryPackagesDataTable;
use App\Repositories\Shop\DeliveryPackages;
use App\Repositories\Shop\SaleChannels;
use Illuminate\Http\Request;
class DeliveryPackageController extends Controller

1
app/Http/Controllers/Admin/Shop/DeliveryTypeController.php
View File

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Admin\Shop;
use App\Datatables\Admin\Shop\DeliveryTypesDataTable;
use App\Repositories\Shop\DeliveryTypes;
use App\Repositories\Shop\SaleChannels;
use Illuminate\Http\Request;
class DeliveryTypeController extends Controller

2
app/Http/Controllers/Admin/Shop/OrderController.php
View File

@@ -4,8 +4,8 @@ namespace App\Http\Controllers\Admin\Shop;
use App\Datatables\Admin\Shop\OrdersDataTable;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Orders;
use App\Repositories\Shop\OrderMails;
use App\Repositories\Shop\Orders;
use Illuminate\Http\Request;
class OrderController extends Controller

1
app/Http/Controllers/Shop/ArticleController.php
View File

@@ -13,6 +13,7 @@ class ArticleController extends Controller
$data['article'] = Articles::getArticleToSell($id);
// $data['breadcrumb'] = Categories::getAncestorsByCategory($category_id);
$data['offers2'] = Articles::getSiblings($id)->toArray();
// dump($data);
// exit;
return view('Shop.Articles.show', $data);

1
app/Http/Controllers/Shop/Auth/RegisterController.php
View File

@@ -3,7 +3,6 @@
namespace App\Http\Controllers\Shop\Auth;
use App\Http\Controllers\Controller;
use App\Http\Requests\Shop\RegisterCustomer;
use App\Repositories\Shop\CustomerAddresses;
use App\Repositories\Shop\Customers;
use Illuminate\Auth\Events\Registered;

12
app/Http/Controllers/Shop/BasketController.php
View File

@@ -2,14 +2,13 @@
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Core\User\ShopCart;
use App\Repositories\Shop\Offers;
use App\Repositories\Shop\Baskets;
use App\Repositories\Shop\Offers;
use App\Repositories\Shop\Orders;
use App\Repositories\Users;
use Illuminate\Http\Request;
class BasketController extends Controller
{
@@ -18,6 +17,7 @@ class BasketController extends Controller
$offerId = $request->input('offer_id');
$quantity = $request->input('quantity') ?? 1;
$price = Offers::getPrice($offerId, $quantity)->price_taxed;
return number_format($quantity * $price, 2);
}
@@ -26,6 +26,7 @@ class BasketController extends Controller
$offerId = $request->input('offer_id');
$quantity = $request->input('quantity') ?? 1;
$update = $request->input('update') ?? false;
return Baskets::addBasket($offerId, $quantity, $update);
}
@@ -35,6 +36,7 @@ class BasketController extends Controller
'offer' => Offers::getFull($offerId)->toArray(),
'basket' => Baskets::addBasket($offerId, $quantity),
];
return view('Shop.Baskets.partials.modalBasket', $data);
}
@@ -43,12 +45,14 @@ class BasketController extends Controller
$data = [
'basket' => Baskets::getBasket(),
];
return view('Shop.Baskets.basket', $data);
}
public function getBasket()
{
$data = ShopCart::getContent();
return response()->json(['data' => $data, 'code' => '200']);
}
@@ -60,6 +64,7 @@ class BasketController extends Controller
public function getSummary()
{
$data = ShopCart::getSummary();
return response()->json(['data' => $data, 'code' => '200']);
}
@@ -70,6 +75,7 @@ class BasketController extends Controller
unset($data['_token']);
$data['user_id'] = Users::getId();
Orders::saveOrder($data);
return response()->json(['code' => '200']);
}

9
app/Http/Controllers/Shop/CategoryController.php
View File

@@ -2,15 +2,13 @@
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Datatables\Shop\CategoriesDataTable;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\ArticleNatures;
use App\Repositories\Shop\Articles;
use App\Repositories\Shop\Categories;
use App\Repositories\Shop\TagGroups;
use App\Datatables\Shop\CategoriesDataTable;
use App\Repositories\Shop\ArticleNatures;
use Illuminate\Http\Request;
class CategoryController extends Controller
{
@@ -62,6 +60,7 @@ class CategoryController extends Controller
]),
'tags' => TagGroups::getWithTagsAndCountOffers($categoryId),
];
// dump($data);
// exit;
return view('Shop.Shelves.shelve', $data);

3
app/Http/Controllers/Shop/CustomerController.php
View File

@@ -2,10 +2,9 @@
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Customers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class CustomerController extends Controller

9
app/Http/Controllers/Shop/HomeController.php
View File

@@ -2,15 +2,11 @@
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Articles;
use App\Repositories\Shop\TagGroups;
use App\Repositories\Shop\Homepages;
use App\Repositories\Config;
use App\Repositories\Core\Arrays;
use App\Repositories\Shop\TagGroups;
use Illuminate\Http\Request;
class HomeController extends Controller
{
@@ -23,6 +19,7 @@ class HomeController extends Controller
'tags' => TagGroups::getWithTagsAndCountOffers(),
'no_filter' => true,
];
return view('Shop.home', $data);
}
}

9
app/Http/Controllers/Shop/InvoiceController.php
View File

@@ -2,12 +2,9 @@
namespace App\Http\Controllers\Shop;
use App\Models\Shop\Invoice;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Invoices;
use App\Repositories\Core\PDF;
use App\Repositories\Shop\Invoices;
class InvoiceController extends Controller
{
@@ -19,6 +16,7 @@ class InvoiceController extends Controller
public function show($uuid)
{
$data = Invoices::getByUUID($uuid);
return view('Shop.Invoices.show', $data);
}
@@ -26,8 +24,9 @@ class InvoiceController extends Controller
{
\Debugbar::disable();
$data['invoice'] = Invoices::getByUUID($uuid);
$filename = 'invoice-' . $uuid . '.pdf';
$filename = 'invoice-'.$uuid.'.pdf';
$html = view('Shop.Invoices.pdf', $data)->toHtml();
// $html = '<h1>Hello world!</h1>';
// return PDF::convertHTML($html);
// return view('Shop.Invoices.pdf', $data);

2
app/Http/Controllers/Shop/OfferController.php
View File

@@ -2,9 +2,7 @@
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Offers;
class OfferController extends Controller

12
app/Http/Controllers/Shop/OrderController.php
View File

@@ -2,18 +2,17 @@
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Datatables\Shop\OrdersDataTable;
use App\Http\Controllers\Controller;
use App\Repositories\Core\User\ShopCart;
use App\Repositories\Shop\Baskets;
use App\Repositories\Shop\Customers;
use App\Repositories\Shop\Deliveries;
use App\Repositories\Shop\Orders;
use App\Repositories\Shop\OrderMails;
use App\Repositories\Shop\Orders;
use App\Repositories\Shop\Paybox;
use App\Repositories\Shop\Baskets;
use App\Repositories\Shop\SaleChannels;
use App\Datatables\Shop\OrdersDataTable;
use Illuminate\Http\Request;
class OrderController extends Controller
{
@@ -30,6 +29,7 @@ class OrderController extends Controller
public function pdf($uuid)
{
$data = Orders::getByUUID($uuid);
return view('Shop.Orders.pdf', $data);
}
@@ -43,6 +43,7 @@ class OrderController extends Controller
'deliveries' => Deliveries::getAllWithSaleChannel()->toArray(),
'sale_channel' => SaleChannels::getDefault()->toArray(),
];
return view('Shop.Orders.order', $data);
} else {
return redirect()->route('home');
@@ -72,6 +73,7 @@ class OrderController extends Controller
public function confirmed()
{
ShopCart::clear();
return view('Shop.Orders.confirmed');
}
}

9
app/Http/Controllers/Shop/OrderPaymentController.php
View File

@@ -2,17 +2,8 @@
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Core\User\ShopCart;
use App\Repositories\Shop\Customers;
use App\Repositories\Shop\Deliveries;
use App\Repositories\Shop\Orders;
use App\Repositories\Shop\Paybox;
use App\Repositories\Shop\Baskets;
use App\Repositories\Shop\SaleChannels;
class OrderPaymentController extends Controller
{
}

4
app/Http/Controllers/Shop/PayboxController.php
View File

@@ -2,9 +2,8 @@
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
class PayboxController extends Controller
{
@@ -32,6 +31,7 @@ class PayboxController extends Controller
{
dump($request);
exit;
return view('paybox.send');
}
}

4
app/Http/Controllers/Shop/SearchController.php
View File

@@ -2,10 +2,9 @@
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\Searches;
use Illuminate\Http\Request;
class SearchController extends Controller
{
@@ -20,6 +19,7 @@ class SearchController extends Controller
'search' => $data,
'product_type' => $data['product_type'],
];
// dump($data);
// exit;
return view('Shop.Search.results', $data);

2
app/Mail/Acheminement.php
View File

@@ -41,6 +41,8 @@ class Acheminement extends TemplateMailable
public $facture;
public $mode_livraison;
public function __construct($order)
{
$this->prenom = $order->customer->first_name;

11
app/Menu/Botanic.php
View File

@@ -3,24 +3,23 @@
namespace App\Menu;
use Sebastienheyd\Boilerplate\Menu\Builder;
use App\Repositories\Users;
class Botanic
{
public function make(Builder $menu)
{
$menu->add('Botanique', [ 'permission' => 'backend_access', 'icon' => 'leaf' ])
$menu->add('Botanique', ['permission' => 'backend_access', 'icon' => 'leaf'])
->id('botanic')
->activeIfRoute('botanic')
->order(4);
$menu->addTo('botanic', 'Familles', [ 'route' => 'Admin.Botanic.Families.index', 'permission' => 'backend_access' ])
$menu->addTo('botanic', 'Familles', ['route' => 'Admin.Botanic.Families.index', 'permission' => 'backend_access'])
->activeIfRoute(['Admin.Botanic.Families.*'])->order(1);
$menu->addTo('botanic', 'Genres', [ 'route' => 'Admin.Botanic.Genres.index', 'permission' => 'backend_access' ])
$menu->addTo('botanic', 'Genres', ['route' => 'Admin.Botanic.Genres.index', 'permission' => 'backend_access'])
->activeIfRoute(['Admin.Botanic.Genres.*'])->order(2);
$menu->addTo('botanic', 'Espèces', [ 'route' => 'Admin.Botanic.Species.index', 'permission' => 'backend_access' ])
$menu->addTo('botanic', 'Espèces', ['route' => 'Admin.Botanic.Species.index', 'permission' => 'backend_access'])
->activeIfRoute(['Admin.Botanic.Species.*'])->order(3);
$menu->addTo('botanic', 'Variétés', [ 'route' => 'Admin.Botanic.Varieties.index', 'permission' => 'backend_access' ])
$menu->addTo('botanic', 'Variétés', ['route' => 'Admin.Botanic.Varieties.index', 'permission' => 'backend_access'])
->activeIfRoute(['Admin.Botanic.Varieties.*'])->order(4);
}
}

2
app/Menu/Contents.php
View File

@@ -8,7 +8,7 @@ class Contents
{
public function make(Builder $menu)
{
$menu->add('Contenus', ['icon' => 'newspaper' ])
$menu->add('Contenus', ['icon' => 'newspaper'])
->id('contents')
->order(6);

2
app/Menu/Customers.php
View File

@@ -8,7 +8,7 @@ class Customers
{
public function make(Builder $menu)
{
$menu->add('Clients', [ 'permission' => 'backend_access', 'icon' => 'address-card' ])
$menu->add('Clients', ['permission' => 'backend_access', 'icon' => 'address-card'])
->id('customers')
->activeIfRoute('customers')
->order(3);

4
app/Menu/Deliveries.php
View File

@@ -14,10 +14,10 @@ class Deliveries
$menu->addTo('sales_mode', __('shop.sale_channels.name'), [
'route' => 'Admin.Shop.SaleChannels.index',
])->activeIfRoute(['Admin.Shop.SaleChannels.*'])->order(1);
])->activeIfRoute(['Admin.Shop.SaleChannels.*'])->order(1);
$menu->addTo('sales_mode', __('shop.deliveries.title'), [
'route' => 'Admin.Shop.Deliveries.index',
])->activeIfRoute(['Admin.Shop.Deliveries.*'])->order(1);
])->activeIfRoute(['Admin.Shop.Deliveries.*'])->order(1);
}
}

2
app/Menu/Merchandises.php
View File

@@ -8,7 +8,7 @@ class Merchandises
{
public function make(Builder $menu)
{
$menu->add('Marchandises', ['icon' => 'shopping-bag' ])
$menu->add('Marchandises', ['icon' => 'shopping-bag'])
->id('merchandises')
->order(5);

22
app/Menu/Orders.php
View File

@@ -8,7 +8,7 @@ class Orders
{
public function make(Builder $menu)
{
$menu->add('Commandes', [ 'permission' => 'backend_access', 'icon' => 'shopping-basket' ])
$menu->add('Commandes', ['permission' => 'backend_access', 'icon' => 'shopping-basket'])
->id('orders')
->activeIfRoute('orders')
->order(1);
@@ -22,16 +22,16 @@ class Orders
'route' => 'Admin.Shop.Invoices.index',
'permission' => 'backend_access',
])->activeIfRoute(['Admin.Shop.Invoices.*'])->order(2);
/*
$menu->addTo('orders', 'Avoirs', [
'route' => 'Admin.Shop.Invoices.index',
'permission' => 'backend_access',
])->activeIfRoute(['Admin.Shop.Invoices.*'])->order(3);
/*
$menu->addTo('orders', 'Avoirs', [
'route' => 'Admin.Shop.Invoices.index',
'permission' => 'backend_access',
])->activeIfRoute(['Admin.Shop.Invoices.*'])->order(3);
$menu->addTo('orders', 'Bons de livraison', [
'route' => 'Admin.Shop.Invoices.index',
'permission' => 'backend_access',
])->activeIfRoute(['Admin.Shop.Invoices.*'])->order(4);
*/
$menu->addTo('orders', 'Bons de livraison', [
'route' => 'Admin.Shop.Invoices.index',
'permission' => 'backend_access',
])->activeIfRoute(['Admin.Shop.Invoices.*'])->order(4);
*/
}
}

2
app/Menu/Settings.php
View File

@@ -8,7 +8,7 @@ class Settings
{
public function make(Builder $menu)
{
$menu->add('Paramètres', [ 'permission' => 'backend_access', 'icon' => 'cogs' ])
$menu->add('Paramètres', ['permission' => 'backend_access', 'icon' => 'cogs'])
->id('settings')
->activeIfRoute('settings')
->order(7);

20
app/Menu/Shop.php
View File

@@ -8,33 +8,33 @@ class Shop
{
public function make(Builder $menu)
{
$menu->add('Catalogue', [ 'permission' => 'backend_access', 'icon' => 'store' ])
$menu->add('Catalogue', ['permission' => 'backend_access', 'icon' => 'store'])
->id('shop')
->activeIfRoute('shop')
->order(2);
$menu->addTo('shop', 'Articles', [ 'route' => 'Admin.Shop.Articles.index', 'permission' => 'backend_access' ])
$menu->addTo('shop', 'Articles', ['route' => 'Admin.Shop.Articles.index', 'permission' => 'backend_access'])
->activeIfRoute(['Admin.Shop.Articles.*'])->order(1);
$menu->addTo('shop', 'Déclinaisons', [ 'route' => 'Admin.Shop.Variations.index', 'permission' => 'backend_access' ])
$menu->addTo('shop', 'Déclinaisons', ['route' => 'Admin.Shop.Variations.index', 'permission' => 'backend_access'])
->activeIfRoute(['Admin.Shop.Variations.*'])->order(2);
$menu->addTo('shop', 'Tarifs', [ 'route' => 'Admin.Shop.Tariffs.index', 'permission' => 'backend_access' ])
$menu->addTo('shop', 'Tarifs', ['route' => 'Admin.Shop.Tariffs.index', 'permission' => 'backend_access'])
->activeIfRoute(['Admin.Shop.Tariffs.*'])->order(3);
$menu->addTo('shop', 'Offres', [ 'route' => 'Admin.Shop.Offers.index', 'permission' => 'backend_access' ])
$menu->addTo('shop', 'Offres', ['route' => 'Admin.Shop.Offers.index', 'permission' => 'backend_access'])
->activeIfRoute(['Admin.Shop.Offers.*'])->order(4);
$menu->addTo('shop', 'Rayons', [ 'route' => 'Admin.Shop.Categories.index', 'permission' => 'backend_access' ])
$menu->addTo('shop', 'Rayons', ['route' => 'Admin.Shop.Categories.index', 'permission' => 'backend_access'])
->activeIfRoute(['Admin.Shop.Categories.*'])->order(6);
$menu->addTo('shop', 'Tags', [ 'route' => 'Admin.Shop.Tags.index', 'permission' => 'backend_access' ])
$menu->addTo('shop', 'Tags', ['route' => 'Admin.Shop.Tags.index', 'permission' => 'backend_access'])
->activeIfRoute(['Admin.Shop.Tags.*'])->order(8);
$menu->addTo('shop', 'Natures d\'articles', [ 'route' => 'Admin.Shop.ArticleNatures.index', 'permission' => 'backend_access' ])
$menu->addTo('shop', 'Natures d\'articles', ['route' => 'Admin.Shop.ArticleNatures.index', 'permission' => 'backend_access'])
->activeIfRoute(['Admin.Shop.ArticleNatures.*'])->order(9);
$menu->addTo('shop', 'Packages', [ 'route' => 'Admin.Shop.Packages.index', 'permission' => 'backend_access' ])
$menu->addTo('shop', 'Packages', ['route' => 'Admin.Shop.Packages.index', 'permission' => 'backend_access'])
->activeIfRoute(['Admin.Shop.Packages.*'])->order(12);
$menu->addTo('shop', 'Unités', [ 'route' => 'Admin.Shop.Unities.index', 'permission' => 'backend_access' ])
$menu->addTo('shop', 'Unités', ['route' => 'Admin.Shop.Unities.index', 'permission' => 'backend_access'])
->activeIfRoute(['Admin.Shop.Unities.*'])->order(14);
}
}

4
app/Models/Botanic/Family.php
View File

@@ -4,15 +4,15 @@ namespace App\Models\Botanic;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Wildside\Userstamps\Userstamps;
use Staudenmeir\EloquentHasManyDeep\HasRelationships;
use Wildside\Userstamps\Userstamps;
class Family extends Model
{
use HasRelationships, SoftDeletes, Userstamps;
protected $guarded = ['id'];
protected $table = 'botanic_families';
public function genres()

2
app/Models/Botanic/Genre.php
View File

@@ -4,7 +4,6 @@ namespace App\Models\Botanic;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Wildside\Userstamps\Userstamps;
class Genre extends Model
@@ -12,6 +11,7 @@ class Genre extends Model
use SoftDeletes, Userstamps;
protected $guarded = ['id'];
protected $table = 'botanic_genres';
public function family()

13
app/Models/Botanic/Specie.php
View File

@@ -2,22 +2,21 @@
namespace App\Models\Botanic;
use App\Models\Shop\Article;
use App\Models\Shop\Tag;
use App\Traits\Model\Imageable;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Wildside\Userstamps\Userstamps;
use Rinvex\Tags\Traits\Taggable;
use Spatie\MediaLibrary\HasMedia;
use App\Traits\Model\Imageable;
use App\Models\Shop\Tag;
use App\Models\Shop\Article;
use Wildside\Userstamps\Userstamps;
class Specie extends Model implements HasMedia
{
use Imageable, SoftDeletes, Taggable, UserStamps;
protected $guarded = ['id'];
protected $table = 'botanic_species';
public function tags()
@@ -42,6 +41,6 @@ class Specie extends Model implements HasMedia
public function scopeByName($query, $name)
{
return $query->where($this->table . '.name', $name);
return $query->where($this->table.'.name', $name);
}
}

18
app/Models/Botanic/Variety.php
View File

@@ -2,24 +2,22 @@
namespace App\Models\Botanic;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Spatie\MediaLibrary\HasMedia;
use Rinvex\Tags\Traits\Taggable;
use Kirschbaum\PowerJoins\PowerJoins;
use Wildside\Userstamps\Userstamps;
use App\Traits\Model\Imageable;
use App\Models\Shop\Article;
use App\Models\Shop\Tag;
use App\Traits\Model\Imageable;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Kirschbaum\PowerJoins\PowerJoins;
use Rinvex\Tags\Traits\Taggable;
use Spatie\MediaLibrary\HasMedia;
use Wildside\Userstamps\Userstamps;
class Variety extends Model implements HasMedia
{
use Imageable, PowerJoins, SoftDeletes, Taggable, UserStamps;
protected $guarded = ['id'];
protected $table = 'botanic_varieties';
public function Specie()

4
app/Models/Shop/Article.php
View File

@@ -20,7 +20,7 @@ use Rinvex\Tags\Traits\Taggable;
use Spatie\MediaLibrary\HasMedia;
use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
use Staudenmeir\EloquentHasManyDeep\HasRelationships;
use \Venturecraft\Revisionable\RevisionableTrait;
use Venturecraft\Revisionable\RevisionableTrait;
use Wildside\Userstamps\Userstamps;
class Article extends Model implements HasMedia
@@ -32,8 +32,8 @@ class Article extends Model implements HasMedia
use Imageable;
use Powerjoins;
use RevisionableTrait;
use Taggable;
use SoftDeletes;
use Taggable;
use UserStamps;
protected $guarded = ['id'];

3
app/Models/Shop/ArticleNature.php
View File

@@ -15,7 +15,7 @@ use Wildside\Userstamps\Userstamps;
class ArticleNature extends Model implements HasMedia
{
use HasRelationships, InteractsWithMedia, SoftDeletes, RevisionableTrait, UserStamps;
use HasRelationships, InteractsWithMedia, RevisionableTrait, SoftDeletes, UserStamps;
protected $guarded = ['id'];
@@ -60,5 +60,4 @@ class ArticleNature extends Model implements HasMedia
$this->addMediaConversion('thumb')->fit(Manipulations::FIT_MAX, 60, 32)->keepOriginalImageFormat()->nonQueued();
$this->addMediaConversion('normal')->fit(Manipulations::FIT_MAX, 360, 192)->keepOriginalImageFormat()->nonQueued();
}
}

2
app/Models/Shop/Delivery.php
View File

@@ -4,7 +4,7 @@ namespace App\Models\Shop;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use \Venturecraft\Revisionable\RevisionableTrait;
use Venturecraft\Revisionable\RevisionableTrait;
use Wildside\Userstamps\Userstamps;
class Delivery extends Model

2
app/Models/Shop/DeliveryPackage.php
View File

@@ -4,7 +4,7 @@ namespace App\Models\Shop;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use \Venturecraft\Revisionable\RevisionableTrait;
use Venturecraft\Revisionable\RevisionableTrait;
use Wildside\Userstamps\Userstamps;
class DeliveryPackage extends Model

2
app/Models/Shop/DeliveryType.php
View File

@@ -4,7 +4,7 @@ namespace App\Models\Shop;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use \Venturecraft\Revisionable\RevisionableTrait;
use Venturecraft\Revisionable\RevisionableTrait;
use Wildside\Userstamps\Userstamps;
class DeliveryType extends Model

2
app/Models/Shop/DeliveryTypeCalculation.php
View File

@@ -4,7 +4,7 @@ namespace App\Models\Shop;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use \Venturecraft\Revisionable\RevisionableTrait;
use Venturecraft\Revisionable\RevisionableTrait;
use Wildside\Userstamps\Userstamps;
class DeliveryTypeCalculation extends Model

2
app/Models/Shop/Merchandise.php
View File

@@ -8,8 +8,8 @@ use Illuminate\Database\Eloquent\SoftDeletes;
use Kirschbaum\PowerJoins\PowerJoins;
use Rinvex\Tags\Traits\Taggable;
use Spatie\MediaLibrary\HasMedia;
use Wildside\Userstamps\Userstamps;
use Venturecraft\Revisionable\RevisionableTrait;
use Wildside\Userstamps\Userstamps;
class Merchandise extends Model implements HasMedia
{

1
app/Repositories/Cities.php
View File

@@ -52,6 +52,7 @@ class Cities
// dump($res);
$latitude = $res[0];
$longitude = $res[1];
// dump($latitude);
// dump($longitude);
return ['latitude' => $latitude, 'longitude' => $longitude];

1
app/Repositories/Core/Geolocation.php
View File

@@ -20,6 +20,7 @@ class Geolocation
// dump($res);
$longitude = $res[0];
$latitude = $res[1];
// dump($latitude);
// dump($longitude);
// exit;

1
app/Repositories/Core/Menu/Item.php
View File

@@ -55,6 +55,7 @@ class Item extends LavaryMenuItem
if (strstr($this->title, 'circle-o')) {
$this->title = str_replace('fa-circle-o', 'fa-dot-circle-o', $this->title);
}
// dump($this);
return $this;
}

2
app/Repositories/Core/Stat.php
View File

@@ -66,6 +66,7 @@ class Stat
->select($db::raw("count(id) as y, $var as name"))
->groupBy($var)
->get();
// var_Debug::message($data);
return $data;
}
@@ -82,6 +83,7 @@ class Stat
$y = (int) $nb[$key];
$data[] = ['y' => $y, 'name' => $value];
}
// var_Debug::message($data);
return $data;
}

1
app/Repositories/Shop/ArticleNatures.php
View File

@@ -62,6 +62,7 @@ class ArticleNatures
$productType = 'botanic';
break;
}
return $productType;
}

7
app/Repositories/Shop/Invoices.php
View File

@@ -13,7 +13,7 @@ class Invoices
public static function getInvoiceHtml($id)
{
$invoice = self::get($id, ['order.customer', 'order.address', 'order.detail']);
$invoice = self::get($id, ['order.customer', 'order.delivery_address', 'order.detail']);
$order = $invoice->order;
$customer = $order->customer;
unset($invoice->order, $order->customer);
@@ -78,4 +78,9 @@ class Invoices
{
return ['En attente', 'Paiement partiel', 'Soldée', 'Paiement rejeté'];
}
public static function getModel()
{
return Invoice::query();
}
}

4
app/Repositories/Shop/OrderMails.php
View File

@@ -5,11 +5,7 @@ namespace App\Repositories\Shop;
use App\Mail\Acheminement;
use App\Mail\ConfirmationCommande;
use App\Mail\Preparation;
use App\Models\Shop\Order;
use App\Repositories\Core\DateStats;
use Carbon\Carbon;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Str;
class OrderMails
{

4
app/User.php
View File

@@ -50,11 +50,11 @@ use Yadahan\AuthenticationLog\AuthenticationLogable;
*/
class User extends Authenticatable
{
use Notifiable;
use AuthenticationLogable;
use LaratrustUserTrait;
use Notifiable;
use SoftDeletes;
use UserHasTeams;
use AuthenticationLogable;
/**
* The attributes that are mass assignable.

7
resources/views/Shop/Invoices/mail.blade.php
View File

@@ -28,9 +28,10 @@
<strong>Livr&eacute; &agrave;:</strong>
</p>
<span style="text-transform: capitalize; letter-spacing: 0px; color: #666666;">
{{ $order['address']['name'] }}<br />
{{ $order['address']['address'] }}<br />
{{ $order['address']['zipcode'] }} {{ $order['address']['city'] }}<br />
{{ $order['delivery_address']['name'] }}<br />
{{ $order['delivery_address']['address'] }}<br />
{{ $order['delivery_address']['zipcode'] }}
{{ $order['delivery_address']['city'] }}<br />
FR
</span>
</div>