Tanchohang/TanchoToplineCargo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
rajustha 2024-05-09 11:35:24 +00:00
commit 6582daae0d
5 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Models/Franchises.php
View File

@ -6,6 +6,7 @@ use App\Models\User;
use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use App\Models\Scopes\StatusScope;
use App\Traits\CreatedUpdatedBy; use App\Traits\CreatedUpdatedBy;
class Franchises extends Model class Franchises extends Model
@ -50,4 +51,9 @@ class Franchises extends Model
get: fn ($value) => User::find($value) ? User::find($value)->name : '', get: fn ($value) => User::find($value) ? User::find($value)->name : '',
); );
} }
public static function boot(){
parent::boot();
static::addGlobalScope(new StatusScope());
}
} }

5
app/Models/Services.php
View File

@ -2,6 +2,7 @@
namespace App\Models; namespace App\Models;
use App\Models\User; use App\Models\User;
use App\Models\Scopes\StatusScope;
use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
@ -59,4 +60,8 @@ class Services extends Model
public function parent(){ public function parent(){
return $this->belongsTo(Services::class,'parent_service'); return $this->belongsTo(Services::class,'parent_service');
} }
public static function boot(){
parent::boot();
static::addGlobalScope(new StatusScope());
}
} }

4
resources/views/client/topCargo/partials/welcome/news.blade.php
View File

@ -9,14 +9,14 @@
@forelse ($news as $item) @forelse ($news as $item)
<div class="item-latest-post clearfix"> <div class="item-latest-post clearfix">
<div class="entry-thumbnail"> <div class="entry-thumbnail">
<a href="{{ route('news', $item->alias) }}"> <a href="{{ route('showNews', $item->alias) }}">
<img style="height: 205px; width:100%; object-fit:cover; object-position:center;" src="{{ asset($item->image) }}" alt="{{$item->title}}" /> <img style="height: 205px; width:100%; object-fit:cover; object-position:center;" src="{{ asset($item->image) }}" alt="{{$item->title}}" />
</a> </a>
</div> </div>
<div class="entry-summary"> <div class="entry-summary">
<h2 class="entry-title">{{ Str::limit($item->title,45) }}</h2> <h2 class="entry-title">{{ Str::limit($item->title,45) }}</h2>
<div class="entry-footer"> <div class="entry-footer">
<a href="{{ route('news', $item->alias) }}">Read More...</a> <a href="{{ route('showNews', $item->alias) }}">Read More...</a>
</div> </div>
</div> </div>
</div> </div>

18
resources/views/client/topCargo/partials/welcome/slider.blade.php
View File

@ -18,7 +18,7 @@
<!-- LAYERS --> <!-- LAYERS -->
<!-- LAYER NR. 1 --> <!-- LAYER NR. 1 -->
<div class="tp-caption tp-resizeme" id="slide-1-layer-9" <div class="tp-caption tp-resizeme" id="slide-1-layer-9"
data-x="['left','left','left','left']" data-hoffset="['495','0','0','0']" data-x="['left','left','left','left']" data-hoffset="['495','0','0','0']"
data-y="['top','top','top','top']" data-voffset="['310','210','310','170']" data-y="['top','top','top','top']" data-voffset="['310','210','310','170']"
data-width="none" data-height="none" data-whitespace="nowrap" data-width="none" data-height="none" data-whitespace="nowrap"
@ -29,7 +29,7 @@
data-paddingleft="[0,0,0,0]" style="z-index: 5;"><img data-paddingleft="[0,0,0,0]" style="z-index: 5;"><img
src="{{ asset('topCargo/assets/images/main-slider/slide-bg.png') }}" alt="" src="{{ asset('topCargo/assets/images/main-slider/slide-bg.png') }}" alt=""
data-ww="['674px','674px','674px','674px']" data-ww="['674px','674px','674px','674px']"
data-hh="['398px','398px','398px','398px']" width="674" height="398" data-hh="['350px','398px','398px','398px']" width="674" height="398"
data-no-retina> </div> data-no-retina> </div>
<!-- LAYER NR. 2 --> <!-- LAYER NR. 2 -->
@ -39,16 +39,14 @@
<div class="tp-caption ch_title text-uppercase slider-title tp-resizeme" <div class="tp-caption ch_title text-uppercase slider-title tp-resizeme"
id="slide-1-layer-1" data-x="['left','left','left','left']" id="slide-1-layer-1" data-x="['left','left','left','left']"
data-hoffset="['540','40','40','40']" data-y="['top','top','top','top']" data-hoffset="['540','40','40','40']" data-y="['top','top','top','top']"
data-voffset="['350','250','350','200']" data-fontsize="['45','50','45','25']" data-voffset="['350','250','350','200']" data-fontsize="['40','45','40','20']"
data-lineheight="['55','50','45','25']" data-width="none" data-height="none" data-lineheight="['55','50','45','25']" data-width="none" data-height="none"
data-whitespace="normal" data-type="text" data-responsive_offset="on" data-whitespace="normal" data-type="text" data-responsive_offset="on"
data-frames='[{"delay":200,"speed":500,"text_c":"transparent","bg_c":"transparent","use_text_c":false,"use_bg_c":false,"frame":"0","from":"opacity:0;","to":"o:1;","ease":"Power3.easeInOut"},{"delay":"wait","speed":500,"use_text_c":false,"use_bg_c":false,"text_c":"transparent","bg_c":"transparent","frame":"999","to":"opacity:0;","ease":"Power3.easeInOut"}]' data-frames='[{"delay":200,"speed":500,"text_c":"transparent","bg_c":"transparent","use_text_c":false,"use_bg_c":false,"frame":"0","from":"opacity:0;","to":"o:1;","ease":"Power3.easeInOut"},{"delay":"wait","speed":500,"use_text_c":false,"use_bg_c":false,"text_c":"transparent","bg_c":"transparent","frame":"999","to":"opacity:0;","ease":"Power3.easeInOut"}]'
data-textAlign="['inherit','inherit','inherit','inherit']" data-paddingtop="[0,0,0,0]" data-textAlign="['inherit','inherit','inherit','inherit']" data-paddingtop="[0,0,0,0]"
data-paddingright="[0,0,0,0]" data-paddingbottom="[0,0,0,0]" data-paddingright="[0,0,0,0]" data-paddingbottom="[0,0,0,0]"
data-paddingleft="[0,0,0,0]" data-paddingleft="[0,0,0,0]"
style="z-index: 8; letter-spacing: 0px; width: 200%; "> style="z-index: 8; letter-spacing: 0px; width: 250%; ">
{{ $slider->slider_title }} {{ $slider->slider_title }}
</div> </div>
@ -56,15 +54,15 @@
<!-- LAYER NR. 4 --> <!-- LAYER NR. 4 -->
<div class="tp-caption ch_content slider-desc tp-resizeme" id="slide-1-layer-3" <div class="tp-caption ch_content slider-desc tp-resizeme" id="slide-1-layer-3"
data-x="['left','left','left','left']" data-hoffset="['540','40','40','40']" data-x="['left','left','left','left']" data-hoffset="['540','40','40','40']"
data-y="['top','top','top','top']" data-voffset="['555','415','515','340']" data-y="['top','top','top','top']" data-voffset="['475','415','515','340']"
data-fontsize="['24','24','18','18']" data-lineheight="['24','24','18','18']" data-fontsize="['20','23','22','18']" data-lineheight="['24','24','18','18']"
data-width="none" data-height="none" data-whitespace="normal" data-type="text" data-width="none" data-height="none" data-whitespace="normal" data-type="text"
data-responsive_offset="on" data-responsive_offset="on"
data-frames='[{"delay":600,"speed":700,"text_c":"transparent","bg_c":"transparent","use_text_c":false,"use_bg_c":false,"frame":"0","from":"opacity:0;","to":"o:1;","ease":"Power3.easeInOut"},{"delay":"wait","speed":700,"use_text_c":false,"use_bg_c":false,"text_c":"transparent","bg_c":"transparent","frame":"999","to":"opacity:0;","ease":"Power3.easeInOut"}]' data-frames='[{"delay":600,"speed":700,"text_c":"transparent","bg_c":"transparent","use_text_c":false,"use_bg_c":false,"frame":"0","from":"opacity:0;","to":"o:1;","ease":"Power3.easeInOut"},{"delay":"wait","speed":700,"use_text_c":false,"use_bg_c":false,"text_c":"transparent","bg_c":"transparent","frame":"999","to":"opacity:0;","ease":"Power3.easeInOut"}]'
data-textAlign="['inherit','inherit','inherit','inherit']" data-paddingtop="[0,0,0,0]" data-textAlign="['inherit','inherit','inherit','inherit']" data-paddingtop="[0,0,0,0]"
data-paddingright="[0,0,0,0]" data-paddingbottom="[0,0,0,0]" data-paddingright="[0,0,0,0]" data-paddingbottom="[0,0,0,0]"
data-paddingleft="[0,0,0,0]" data-paddingleft="[0,0,0,0]"
style="z-index: 8; white-space: normal; width: 400%; letter-spacing: 0px;"> style="z-index: 8; width: 30em; letter-spacing: 0px;word-break:break-all;">
{{ $slider->slider_desc }}</div> {{ $slider->slider_desc }}</div>

4
storage/logs/laravel.log
View File

@ -33503,6 +33503,7 @@ The event was not just about a flight taking off; it symbolized a journey of pro
#53 /Applications/XAMPP/xamppfiles/htdocs/Cargo_CMS/server.php(21): require_once('/Applications/X...') #53 /Applications/XAMPP/xamppfiles/htdocs/Cargo_CMS/server.php(21): require_once('/Applications/X...')
#54 {main} #54 {main}
"} "}
<<<<<<< HEAD
>>>>>>> 9fa6a5d79720007756721d82c4fde70e31a0f1f1 >>>>>>> 9fa6a5d79720007756721d82c4fde70e31a0f1f1
[2024-05-08 09:20:27] local.ERROR: syntax error, unexpected token "<<" {"exception":"[object] (ParseError(code: 0): syntax error, unexpected token \"<<\" at /home/myurlsco/03Demos/toplinecargo/app/Http/Controllers/WebsiteController.php:91) [2024-05-08 09:20:27] local.ERROR: syntax error, unexpected token "<<" {"exception":"[object] (ParseError(code: 0): syntax error, unexpected token \"<<\" at /home/myurlsco/03Demos/toplinecargo/app/Http/Controllers/WebsiteController.php:91)
[stacktrace] [stacktrace]
@ -33870,3 +33871,6 @@ Did you mean one of these?
#3 /home/myurlsco/03Demos/toplinecargo/artisan(35): Illuminate\\Foundation\\Console\\Kernel->handle() #3 /home/myurlsco/03Demos/toplinecargo/artisan(35): Illuminate\\Foundation\\Console\\Kernel->handle()
#4 {main} #4 {main}
"} "}
=======
[2024-05-09 09:59:22] local.INFO: SQLSTATE[22001]: String data, right truncated: 1406 Data too long for column 'slider_desc' at row 1 (Connection: mysql, SQL: update `tbl_sliders` set `slider_desc` = if a list-style-image is specified, the value of this property will be displayed if the image for some reason cannot be displayedif a list-style-image is specified, the value of this property will be displayed if the image for some reason cannot be displayed, `updatedBy` = 1, `tbl_sliders`.`updated_at` = 2024-05-09 09:59:22 where `slider_id` = 12)
>>>>>>> bf885d6b4dc1c607729ff32b219aecaaaa24217b