Minor presentation fixes for ordering, and npm updates
This commit is contained in:
Deon George
parent
b737375be5
commit
e9b5f9ac0c
@ -78,9 +78,12 @@ class Product extends Model
|
||||
return $this->setup_cost + ( $this->default_cost * array_get($table,$this->price_recurr_default) * $this->contract_term);
|
||||
}
|
||||
|
||||
public function getNameAttribute()
|
||||
public function getNameAttribute(Language $lo=NULL)
|
||||
{
|
||||
return $this->name(Auth::user()->language);
|
||||
if (is_null($lo))
|
||||
$lo = $this->getDefaultLanguage();
|
||||
|
||||
return $this->descriptions->where('language_id',$lo->id)->first()->description_short;
|
||||
}
|
||||
|
||||
public function getProductTypeAttribute()
|
||||
@ -123,7 +126,7 @@ class Product extends Model
|
||||
if (is_null($lo))
|
||||
$lo = $this->getDefaultLanguage();
|
||||
|
||||
return $this->descriptions->where('language_id',$lo->id)->first()->description_short;
|
||||
return $this->descriptions->where('language_id',$lo->id)->first()->description_full;
|
||||
}
|
||||
|
||||
public function orderValidation(Request $request)
|
||||
|
||||
@ -7,4 +7,9 @@ use Illuminate\Database\Eloquent\Model;
|
||||
class ProductTranslate extends Model
|
||||
{
|
||||
protected $table = 'ab_product_translate';
|
||||
|
||||
public function getDescriptionFullAttribute($value)
|
||||
{
|
||||
return unserialize($value);
|
||||
}
|
||||
}
|
||||
6
composer.lock
generated
6
composer.lock
generated
@ -2463,11 +2463,11 @@
|
||||
},
|
||||
{
|
||||
"name": "leenooks/laravel",
|
||||
"version": "0.2.1",
|
||||
"version": "0.2.2",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://dev.leenooks.net/leenooks/laravel",
|
||||
"reference": "f8d743296580ccf17260505be0b5baee17ac82c6"
|
||||
"reference": "3af5ae6466776aaae574dc184498e29e74e02c77"
|
||||
},
|
||||
"require": {
|
||||
"igaster/laravel-theme": "2.0.6",
|
||||
@ -2503,7 +2503,7 @@
|
||||
"laravel",
|
||||
"leenooks"
|
||||
],
|
||||
"time": "2018-08-11T05:11:34+00:00"
|
||||
"time": "2018-08-12T07:01:50+00:00"
|
||||
},
|
||||
{
|
||||
"name": "maximebf/debugbar",
|
||||
|
||||
540
package-lock.json
generated
540
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
23
package.json
23
package.json
@ -12,34 +12,35 @@
|
||||
"stats": "node node_modules/cross-env/dist/bin/cross-env.js NODE_ENV=production node_modules/webpack/bin/webpack.js --config=node_modules/laravel-mix/setup/webpack.config.js --profile --json > stats.json"
|
||||
},
|
||||
"devDependencies": {
|
||||
"acacha-forms": "^1.0.8",
|
||||
"admin-lte": "^2.4.3",
|
||||
"acacha-forms": "^1.0.10",
|
||||
"admin-lte": "^2.4.8",
|
||||
"axios": "^0.8",
|
||||
"babel-eslint": "^7.1.1",
|
||||
"bootstrap-sass": "3.3.7",
|
||||
"cross-env": "^5.0.1",
|
||||
"cross-env": "^5.2.0",
|
||||
"eslint": "^3.14.1",
|
||||
"eslint-config-standard": "^6.2.1",
|
||||
"eslint-friendly-formatter": "^2.0.7",
|
||||
"eslint-loader": "^1.6.1",
|
||||
"eslint-plugin-html": "^2.0.0",
|
||||
"eslint-plugin-promise": "^3.4.0",
|
||||
"eslint-plugin-promise": "^3.8.0",
|
||||
"eslint-plugin-standard": "^2.0.1",
|
||||
"font-awesome": "^4.7.0",
|
||||
"icheck": "^1.0.2",
|
||||
"ionicons": "^3.0.0",
|
||||
"jquery": "^3.2",
|
||||
"laravel-mix": "^2.0",
|
||||
"less": "^3.0.1",
|
||||
"less": "^3.8.1",
|
||||
"less-loader": "^4.1.0",
|
||||
"lodash": "^4.17.4",
|
||||
"popper.js": "^1.12",
|
||||
"lodash": "^4.17.10",
|
||||
"popper.js": "^1.14.4",
|
||||
"toastr": "^2.1.4",
|
||||
"vue": "^2.5.7"
|
||||
"vue": "^2.5.17"
|
||||
},
|
||||
"dependencies": {
|
||||
"datatables.net": "^1.10.16",
|
||||
"datatables.net-dt": "^1.10.16",
|
||||
"npm": "^6.3.0"
|
||||
"datatables.net": "^1.10.19",
|
||||
"datatables.net-dt": "^1.10.19",
|
||||
"npm": "^6.3.0",
|
||||
"vue-template-compiler": "^2.5.17"
|
||||
}
|
||||
}
|
||||
|
||||
10
public/css/adminlte-app.css
vendored
10
public/css/adminlte-app.css
vendored
@ -1,5 +1,5 @@
|
||||
/*!
|
||||
* AdminLTE v2.4.2
|
||||
* AdminLTE v2.4.8
|
||||
* Author: Almsaeed Studio
|
||||
* Website: Almsaeed Studio <https://adminlte.io>
|
||||
* License: Open source - MIT
|
||||
@ -47,7 +47,7 @@ body {
|
||||
position: relative;
|
||||
}
|
||||
.layout-boxed {
|
||||
background: url(/images/vendor/admin-lte/dist/boxed-bg.jpg?5bbbd344130f0926b70aa3499638a387) repeat fixed;
|
||||
background-color: #f9fafc;
|
||||
}
|
||||
/*
|
||||
* Content Wrapper - contains the main content
|
||||
@ -275,7 +275,7 @@ a:focus {
|
||||
text-align: center;
|
||||
font-size: 9px;
|
||||
padding: 2px 3px;
|
||||
line-height: .9;
|
||||
line-height: 0.9;
|
||||
}
|
||||
.main-header .logo {
|
||||
-webkit-transition: width 0.3s ease-in-out;
|
||||
@ -602,6 +602,7 @@ a:focus {
|
||||
margin-left: 50px;
|
||||
}
|
||||
}
|
||||
@media (min-width: 768px) {
|
||||
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span:not(.pull-right),
|
||||
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
|
||||
display: block !important;
|
||||
@ -630,6 +631,7 @@ a:focus {
|
||||
top: 44px;
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
.sidebar-expanded-on-hover .main-footer,
|
||||
.sidebar-expanded-on-hover .content-wrapper {
|
||||
margin-left: 50px;
|
||||
@ -682,7 +684,7 @@ a:focus {
|
||||
padding-top: 50px;
|
||||
z-index: 1010;
|
||||
}
|
||||
@media (max-width: 768px) {
|
||||
@media (max-width: 767px) {
|
||||
.control-sidebar {
|
||||
padding-top: 100px;
|
||||
}
|
||||
|
||||
26
public/css/all.css
vendored
26
public/css/all.css
vendored
@ -16471,23 +16471,23 @@ button.close {
|
||||
border-left: 1px solid #eee;
|
||||
border-right-width: 0;
|
||||
}
|
||||
.skin-black .main-header > .logo {
|
||||
.skin-black .main-header .logo {
|
||||
background-color: #ffffff;
|
||||
color: #333333;
|
||||
border-bottom: 0 solid transparent;
|
||||
border-right: 1px solid #eee;
|
||||
}
|
||||
.skin-black .main-header > .logo:hover {
|
||||
.skin-black .main-header .logo:hover {
|
||||
background-color: #fcfcfc;
|
||||
}
|
||||
@media (max-width: 767px) {
|
||||
.skin-black .main-header > .logo {
|
||||
.skin-black .main-header .logo {
|
||||
background-color: #222222;
|
||||
color: #ffffff;
|
||||
border-bottom: 0 solid transparent;
|
||||
border-right: none;
|
||||
}
|
||||
.skin-black .main-header > .logo:hover {
|
||||
.skin-black .main-header .logo:hover {
|
||||
background-color: #1f1f1f;
|
||||
}
|
||||
}
|
||||
@ -16631,23 +16631,23 @@ button.close {
|
||||
border-left: 1px solid #d2d6de;
|
||||
border-right-width: 0;
|
||||
}
|
||||
.skin-black-light .main-header > .logo {
|
||||
.skin-black-light .main-header .logo {
|
||||
background-color: #ffffff;
|
||||
color: #333333;
|
||||
border-bottom: 0 solid transparent;
|
||||
border-right: 1px solid #d2d6de;
|
||||
}
|
||||
.skin-black-light .main-header > .logo:hover {
|
||||
.skin-black-light .main-header .logo:hover {
|
||||
background-color: #fcfcfc;
|
||||
}
|
||||
@media (max-width: 767px) {
|
||||
.skin-black-light .main-header > .logo {
|
||||
.skin-black-light .main-header .logo {
|
||||
background-color: #222222;
|
||||
color: #ffffff;
|
||||
border-bottom: 0 solid transparent;
|
||||
border-right: none;
|
||||
}
|
||||
.skin-black-light .main-header > .logo:hover {
|
||||
.skin-black-light .main-header .logo:hover {
|
||||
background-color: #1f1f1f;
|
||||
}
|
||||
}
|
||||
@ -17898,7 +17898,7 @@ button.close {
|
||||
}
|
||||
|
||||
/*!
|
||||
* AdminLTE v2.4.2
|
||||
* AdminLTE v2.4.8
|
||||
* Author: Almsaeed Studio
|
||||
* Website: Almsaeed Studio <https://adminlte.io>
|
||||
* License: Open source - MIT
|
||||
@ -17946,7 +17946,7 @@ body {
|
||||
position: relative;
|
||||
}
|
||||
.layout-boxed {
|
||||
background: url(/images/vendor/admin-lte/dist/boxed-bg.jpg?5bbbd344130f0926b70aa3499638a387) repeat fixed;
|
||||
background-color: #f9fafc;
|
||||
}
|
||||
/*
|
||||
* Content Wrapper - contains the main content
|
||||
@ -18174,7 +18174,7 @@ a:focus {
|
||||
text-align: center;
|
||||
font-size: 9px;
|
||||
padding: 2px 3px;
|
||||
line-height: .9;
|
||||
line-height: 0.9;
|
||||
}
|
||||
.main-header .logo {
|
||||
-webkit-transition: width 0.3s ease-in-out;
|
||||
@ -18501,6 +18501,7 @@ a:focus {
|
||||
margin-left: 50px;
|
||||
}
|
||||
}
|
||||
@media (min-width: 768px) {
|
||||
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > a > span:not(.pull-right),
|
||||
.sidebar-mini:not(.sidebar-mini-expand-feature).sidebar-collapse .sidebar-menu > li:hover > .treeview-menu {
|
||||
display: block !important;
|
||||
@ -18529,6 +18530,7 @@ a:focus {
|
||||
top: 44px;
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
.sidebar-expanded-on-hover .main-footer,
|
||||
.sidebar-expanded-on-hover .content-wrapper {
|
||||
margin-left: 50px;
|
||||
@ -18581,7 +18583,7 @@ a:focus {
|
||||
padding-top: 50px;
|
||||
z-index: 1010;
|
||||
}
|
||||
@media (max-width: 768px) {
|
||||
@media (max-width: 767px) {
|
||||
.control-sidebar {
|
||||
padding-top: 100px;
|
||||
}
|
||||
|
||||
13425
public/js/app.js
vendored
13425
public/js/app.js
vendored
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
<div class="col-md-12">
|
||||
<p>{{ $o->description }}</p>
|
||||
<p>{!! $o->description !!}</p>
|
||||
</div>
|
||||
|
||||
<table class="table table-condensed">
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<div class="col-md-12">
|
||||
<p>{{ $o->description }}</p>
|
||||
<p>{!! $o->description !!}</p>
|
||||
</div>
|
||||
|
||||
<table class="table table-condensed">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user