add shipping rules
This commit is contained in:
@@ -22,7 +22,6 @@ trait SendsPasswordResetEmails
|
||||
/**
|
||||
* Send a reset link to the given user.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
|
||||
*/
|
||||
public function sendResetLinkEmail(Request $request)
|
||||
@@ -44,7 +43,6 @@ trait SendsPasswordResetEmails
|
||||
/**
|
||||
* Validate the email for the given request.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return void
|
||||
*/
|
||||
protected function validateEmail(Request $request)
|
||||
@@ -55,7 +53,6 @@ trait SendsPasswordResetEmails
|
||||
/**
|
||||
* Get the needed authentication credentials from the request.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return array
|
||||
*/
|
||||
protected function credentials(Request $request)
|
||||
@@ -66,7 +63,6 @@ trait SendsPasswordResetEmails
|
||||
/**
|
||||
* Get the response for a successful password reset link.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param string $response
|
||||
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
|
||||
*/
|
||||
@@ -80,7 +76,6 @@ trait SendsPasswordResetEmails
|
||||
/**
|
||||
* Get the response for a failed password reset link.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param string $response
|
||||
* @return \Illuminate\Http\RedirectResponse
|
||||
*
|
||||
@@ -95,8 +90,8 @@ trait SendsPasswordResetEmails
|
||||
}
|
||||
|
||||
return back()
|
||||
->withInput($request->only('email'))
|
||||
->withErrors(['email' => trans($response)]);
|
||||
->withInput($request->only('email'))
|
||||
->withErrors(['email' => trans($response)]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -8,4 +8,4 @@ trait CanComment
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,10 +2,9 @@
|
||||
|
||||
namespace App\Traits\Model;
|
||||
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use App\Contracts\Commentator;
|
||||
use Illuminate\Database\Eloquent\Relations\MorphMany;
|
||||
use App\Models\Core\Comment;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
trait HasComments
|
||||
{
|
||||
@@ -32,5 +31,4 @@ trait HasComments
|
||||
|
||||
return $this->comments()->save($comment);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
namespace App\Traits\Model;
|
||||
|
||||
use Spatie\Image\Manipulations;
|
||||
use Spatie\MediaLibrary\MediaCollections\Models\Media;
|
||||
use Spatie\MediaLibrary\InteractsWithMedia;
|
||||
use Spatie\MediaLibrary\MediaCollections\Models\Media;
|
||||
|
||||
trait Imageable
|
||||
{
|
||||
@@ -20,7 +20,7 @@ trait Imageable
|
||||
return $this->hasOne(Media::class, 'model_id')->where('model_type', get_class($this))->latest();
|
||||
}
|
||||
|
||||
public function registerMediaConversions(Media $media = null) : void
|
||||
public function registerMediaConversions(Media $media = null): void
|
||||
{
|
||||
$this->addMediaConversion('thumb')->fit(Manipulations::FIT_CROP, 32, 32);
|
||||
$this->addMediaConversion('mini')->fit(Manipulations::FIT_CROP, 96, 96);
|
||||
|
||||
@@ -19,6 +19,7 @@ trait Imageable
|
||||
public static function getThumb($image, $with_undefined = true)
|
||||
{
|
||||
$src = self::getThumbSrc($image, $with_undefined);
|
||||
|
||||
return $src ? "<img src='$src'>" : '';
|
||||
}
|
||||
|
||||
@@ -30,6 +31,7 @@ trait Imageable
|
||||
public static function getPreview($image, $with_undefined = true)
|
||||
{
|
||||
$src = self::getPreviewSrc($image, $with_undefined);
|
||||
|
||||
return $src ? "<img src='$src' class='img-fluid'>" : '';
|
||||
}
|
||||
|
||||
@@ -41,6 +43,7 @@ trait Imageable
|
||||
public static function getNormal($image, $with_undefined = true)
|
||||
{
|
||||
$src = self::getNormalSrc($image, $with_undefined);
|
||||
|
||||
return $src ? "<img src='$src'>" : '';
|
||||
}
|
||||
|
||||
@@ -52,6 +55,7 @@ trait Imageable
|
||||
public static function getImage($image, $with_undefined = true)
|
||||
{
|
||||
$src = self::getImageSrc($image, $with_undefined);
|
||||
|
||||
return $src ? "<img src='$src' class='img-fluid'>" : '';
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user