coding styles
This commit is contained in:
@@ -16,6 +16,7 @@ class PayboxController extends Controller
|
|||||||
{
|
{
|
||||||
dump($request->all());
|
dump($request->all());
|
||||||
exit;
|
exit;
|
||||||
|
|
||||||
return view('paybox.refused');
|
return view('paybox.refused');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -39,18 +39,7 @@ class Article extends Model implements HasMedia
|
|||||||
|
|
||||||
protected $table = 'shop_articles';
|
protected $table = 'shop_articles';
|
||||||
|
|
||||||
protected $revisionEnabled = true;
|
protected $dontKeepRevisionOf = ['updated_by', 'updated_at'];
|
||||||
|
|
||||||
protected $keepRevisionOf = [
|
|
||||||
'article_nature_id',
|
|
||||||
'product_type',
|
|
||||||
'product_id',
|
|
||||||
'ref',
|
|
||||||
'name',
|
|
||||||
'description',
|
|
||||||
'visible',
|
|
||||||
'homepage',
|
|
||||||
];
|
|
||||||
|
|
||||||
public function article_nature(): BelongsTo
|
public function article_nature(): BelongsTo
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ use App\Notifications\VerifyEmail;
|
|||||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
use Illuminate\Database\Eloquent\SoftDeletes;
|
||||||
use Illuminate\Foundation\Auth\User as Authenticatable;
|
use Illuminate\Foundation\Auth\User as Authenticatable;
|
||||||
use Illuminate\Notifications\Notifiable;
|
use Illuminate\Notifications\Notifiable;
|
||||||
use Venturecraft\Revisionable\RevisionableTrait;
|
|
||||||
use Staudenmeir\EloquentHasManyDeep\HasRelationships;
|
use Staudenmeir\EloquentHasManyDeep\HasRelationships;
|
||||||
|
use Venturecraft\Revisionable\RevisionableTrait;
|
||||||
use Yadahan\AuthenticationLog\AuthenticationLogable;
|
use Yadahan\AuthenticationLog\AuthenticationLogable;
|
||||||
|
|
||||||
class Customer extends Authenticatable
|
class Customer extends Authenticatable
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ class Delivery extends Model
|
|||||||
{
|
{
|
||||||
return $query->whereIn($this->table.'.sale_channel_id', $ids);
|
return $query->whereIn($this->table.'.sale_channel_id', $ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function scopeBySaleChannel($query)
|
public function scopeBySaleChannel($query)
|
||||||
{
|
{
|
||||||
return $query->where($this->table.'.sale_channel_id', 1);
|
return $query->where($this->table.'.sale_channel_id', 1);
|
||||||
@@ -90,7 +90,7 @@ class Delivery extends Model
|
|||||||
|
|
||||||
public function scopeByCustomer($query, $customerId)
|
public function scopeByCustomer($query, $customerId)
|
||||||
{
|
{
|
||||||
return $query->whereHas('customers', function($query) use ($customerId) {
|
return $query->whereHas('customers', function ($query) use ($customerId) {
|
||||||
return $query->byId($customerId);
|
return $query->byId($customerId);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ class Invoice extends Model
|
|||||||
|
|
||||||
protected $revisionCreationsEnabled = false;
|
protected $revisionCreationsEnabled = false;
|
||||||
|
|
||||||
protected $keepRevisionOf = ['status', 'total_taxed', 'shipping', 'total_shipped'];
|
protected $dontKeepRevisionOf = ['updated_by', 'updated_at'];
|
||||||
|
|
||||||
public function payments()
|
public function payments()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ use Wildside\Userstamps\Userstamps;
|
|||||||
class InvoicePayment extends Model
|
class InvoicePayment extends Model
|
||||||
{
|
{
|
||||||
use RevisionableTrait, Userstamps;
|
use RevisionableTrait, Userstamps;
|
||||||
|
|
||||||
protected $guarded = ['id'];
|
protected $guarded = ['id'];
|
||||||
|
|
||||||
protected $table = 'shop_invoice_payments';
|
protected $table = 'shop_invoice_payments';
|
||||||
@@ -36,7 +36,7 @@ class InvoicePayment extends Model
|
|||||||
|
|
||||||
public function scopeByOrder($query, $orderId)
|
public function scopeByOrder($query, $orderId)
|
||||||
{
|
{
|
||||||
return $query->whereHas('order', function($query) use ($orderId) {
|
return $query->whereHas('order', function ($query) use ($orderId) {
|
||||||
return $query->byOrder($orderId);
|
return $query->byOrder($orderId);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -222,7 +222,7 @@ class Articles
|
|||||||
{
|
{
|
||||||
$saleChannelId = $options['sale_channel_id'] ?? SaleChannels::getDefaultID();
|
$saleChannelId = $options['sale_channel_id'] ?? SaleChannels::getDefaultID();
|
||||||
$model = self::getModelByOptions($options);
|
$model = self::getModelByOptions($options);
|
||||||
|
|
||||||
return $model->withAvailableOffers($saleChannelId)->with([
|
return $model->withAvailableOffers($saleChannelId)->with([
|
||||||
'image',
|
'image',
|
||||||
'product',
|
'product',
|
||||||
@@ -308,7 +308,7 @@ class Articles
|
|||||||
public static function getFull($id)
|
public static function getFull($id)
|
||||||
{
|
{
|
||||||
$data['article'] = self::getArticleEdit($id);
|
$data['article'] = self::getArticleEdit($id);
|
||||||
|
|
||||||
return self::getMeta($data);
|
return self::getMeta($data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
namespace App\Repositories\Shop;
|
namespace App\Repositories\Shop;
|
||||||
|
|
||||||
use App\Models\Shop\Delivery;
|
use App\Models\Shop\Delivery;
|
||||||
use App\Repositories\Shop\Customers;
|
|
||||||
use App\Traits\Model\Basic;
|
use App\Traits\Model\Basic;
|
||||||
|
|
||||||
class Deliveries
|
class Deliveries
|
||||||
|
|||||||
@@ -2,12 +2,12 @@
|
|||||||
|
|
||||||
namespace App\Repositories\Shop;
|
namespace App\Repositories\Shop;
|
||||||
|
|
||||||
use Illuminate\Support\Facades\App;
|
|
||||||
use Illuminate\Support\Facades\Log;
|
|
||||||
use Bnb\PayboxGateway\Requests\Paybox\AuthorizationWithCapture;
|
use Bnb\PayboxGateway\Requests\Paybox\AuthorizationWithCapture;
|
||||||
use Bnb\PayboxGateway\Requests\PayboxDirect\Capture;
|
use Bnb\PayboxGateway\Requests\PayboxDirect\Capture;
|
||||||
use Bnb\PayboxGateway\Responses\Paybox\Verify;
|
|
||||||
use Bnb\PayboxGateway\Responses\Exceptions\InvalidSignature;
|
use Bnb\PayboxGateway\Responses\Exceptions\InvalidSignature;
|
||||||
|
use Bnb\PayboxGateway\Responses\Paybox\Verify;
|
||||||
|
use Illuminate\Support\Facades\App;
|
||||||
|
use Illuminate\Support\Facades\Log;
|
||||||
|
|
||||||
class Paybox
|
class Paybox
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user