Compare commits

..

No commits in common. '9dd5008ee22839573e2466667d4bd13f52ceae42' and 'f5a2f3dc67ffe362e81d4afad506a05c87d32784' have entirely different histories.

@ -13,8 +13,7 @@ class Setting extends Model
public $translatable = ['value']; public $translatable = ['value'];
public static $settingTypes = ['TEXT', 'NUMBER', 'LONGTEXT', 'CODE', 'EDITOR', public static $settingTypes = ['TEXT', 'NUMBER', 'LONGTEXT', 'CODE', 'EDITOR',
'CATEGORY', 'GROUP', 'CHECKBOX', 'FILE', 'COLOR', 'SELECT', 'MENU', 'LOCATION', 'CATEGORY', 'GROUP', 'CHECKBOX', 'FILE', 'COLOR', 'SELECT', 'MENU', 'LOCATION', 'ICON'];
'ICON','DATE','DATETIME','TIME'];
public function getData() public function getData()
{ {

@ -118,10 +118,6 @@ app.component('lat-lng', Latlng);
import MenuItemInput from "./components/MenuItemInput.vue"; import MenuItemInput from "./components/MenuItemInput.vue";
app.component('menu-item-input', MenuItemInput); app.component('menu-item-input', MenuItemInput);
import VueTimepicker from "./components/vueTimePicker.vue";
app.component('vue-time-picker', VueTimepicker);
/** /**
* The following block of code may be used to automatically register your * The following block of code may be used to automatically register your
* Vue components. It will recursively scan this directory for the Vue * Vue components. It will recursively scan this directory for the Vue

@ -395,9 +395,9 @@ export default {
// get input class // get input class
getClass: function () { getClass: function () {
if (this.err == true || (typeof this.err == 'String' && this.err.trim() == '1')) { if (this.err == true || (typeof this.err == 'String' && this.err.trim() == '1')) {
return 'form-control is-invalid text-center' + this.customClass; return 'form-control is-invalid ' + this.customClass;
} }
return 'form-control text-center ' + this.customClass; return 'form-control ' + this.customClass;
}, },
/* /*
* make array of this month days [gregorian] * make array of this month days [gregorian]

@ -105,7 +105,7 @@
</label> </label>
{{-- WIP for lang change def tab--}} {{-- WIP for lang change def tab--}}
<vue-datetime-picker-input :xmin="{{strtotime('yesterday')}}" <vue-datetime-picker-input :xmin="{{strtotime('yesterday')}}"
xid="dp" xname="expire" xtitle="Expire date" @if(app()->getLocale() != 'fa') def-tab="1" xshow="date" @else xshow="pdate" @endif xid="dp" xname="expire" xshow="date" xtitle="Expire date" def-tab="1"
@if(isset($item)) :xvalue="{{strtotime($item->expire)}}" @endif @if(isset($item)) :xvalue="{{strtotime($item->expire)}}" @endif
></vue-datetime-picker-input> ></vue-datetime-picker-input>
</div> </div>

@ -104,7 +104,7 @@
</label> </label>
<vue-datetime-picker-input <vue-datetime-picker-input
:xmax="{{strtotime('yesterday')}}" :xmax="{{strtotime('yesterday')}}"
xid="dp" xname="dob" xtitle="{{__("Date of born")}}" @if(app()->getLocale() != 'fa') def-tab="1" xshow="date" @else xshow="pdate" @endif xid="dp" xname="dob" xshow="pdate" xtitle="{{__("Date of born")}}" def-tab="0"
@if(isset($item)) :xvalue="{{strtotime($item->dob)}}" @endif @if(isset($item)) :xvalue="{{strtotime($item->dob)}}" @endif
:timepicker="false" :timepicker="false"
></vue-datetime-picker-input> ></vue-datetime-picker-input>

@ -44,7 +44,7 @@
</label> </label>
<vue-datetime-picker-input <vue-datetime-picker-input
:xmin="{{strtotime('yesterday')}}" :xmin="{{strtotime('yesterday')}}"
xid="dp" xname="expire" xtitle="Expire date" @if(app()->getLocale() != 'fa') def-tab="1" xshow="datetime" @else xshow="pdatetime" @endif xid="dp" xname="expire" xshow="datetime" xtitle="Expire date" def-tab="1"
@if(isset($item)) :xvalue="{{strtotime($item->expire)}}" @endif @if(isset($item)) :xvalue="{{strtotime($item->expire)}}" @endif
:timepicker="true" :timepicker="true"
></vue-datetime-picker-input> ></vue-datetime-picker-input>

@ -22,26 +22,6 @@
class="form-control" class="form-control"
rows="5">{{old($setting->key, $setting->value)}}</textarea> rows="5">{{old($setting->key, $setting->value)}}</textarea>
@break @break
@case('TIME')
<vue-time-picker :am-pm="false"
xid="{{$setting->key}}"
xname="{{$setting->key}}"
:xvalue="{{$setting->value}}"
xtitle="{{$setting->title}}"></vue-time-picker>
@break
@case('DATE')
<vue-datetime-picker-input
xid="{{$setting->key}}" xname="{{$setting->key}}" @if(app()->getLocale() == 'fa') xshow="pdate" @else xshow="date" @endif xtitle="{{$setting->title}}" @if(app()->getLocale() != 'fa') def-tab="1" @endif
:xvalue="{{$setting->value}}"
></vue-datetime-picker-input>
@break
@case('DATETIME')
<vue-datetime-picker-input
xid="{{$setting->key}}" xname="{{$setting->key}}" @if(app()->getLocale() == 'fa') xshow="pdatetime" @else xshow="datetime" @endif xtitle="{{$setting->title}}" @if(app()->getLocale() != 'fa') def-tab="1" @endif
:xvalue="{{$setting->value}}"
:timepicker="true"
></vue-datetime-picker-input>
@break
@case('ICON') @case('ICON')
<remix-icon-picker xname="{{$setting->key}}" xvalue="{{old($setting->key, $setting->value)}}"></remix-icon-picker> <remix-icon-picker xname="{{$setting->key}}" xvalue="{{old($setting->key, $setting->value)}}"></remix-icon-picker>
@break @break

@ -287,8 +287,7 @@
</label> </label>
<vue-datetime-picker-input <vue-datetime-picker-input
:xmax="{{strtotime('yesterday')}}" :xmax="{{strtotime('yesterday')}}"
xid="dp" xname="dob" xtitle="{{__("Date of born")}}" xid="dp" xname="dob" xshow="pdate" xtitle="{{__("Date of born")}}" def-tab="0"
@if(app()->getLocale() != 'fa') def-tab="1" xshow="date" @else xshow="pdate" @endif
:xvalue="{{strtotime(auth('customer')->user()->dob)}}" :xvalue="{{strtotime(auth('customer')->user()->dob)}}"
:timepicker="false" :timepicker="false"
></vue-datetime-picker-input> ></vue-datetime-picker-input>

Loading…
Cancel
Save