nadim
/
automngr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small fixes

shift-build-2464
Nadim Salloum 2021-06-11 13:45:53 +03:00
parent 91d1cdd15a
commit 995f42b4c9
8 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/ContractController.php
View File

@ -51,7 +51,7 @@ class ContractController extends Controller
'car' => $this->getCarFields($car),
'contact' => $this->getContactFields($contact),
'type' => ContractType::coerce($type)->key,
'car_first' => $request->query('carFirst'),
'car_first' => (bool)$request->query('carFirst'),
]);
}
@ -153,6 +153,7 @@ class ContractController extends Controller
'contract' => [
'id' => $contract->id,
'date' => $contract->date,
'date_formatted' => $contract->date_formatted,
'is_sell_contract' => $contract->isSellContract(),
'price' => $contract->price->getAmount(),
'insurance_type' => (string)$contract->insurance_type,

2
public/css/app.css vendored
View File

@ -1,4 +1,4 @@
/*! tailwindcss v2.1.2 | MIT License | https://tailwindcss.com */
/*! tailwindcss v2.1.4 | MIT License | https://tailwindcss.com */
/*! modern-normalize v1.1.0 | MIT License | https://github.com/sindresorhus/modern-normalize */

24
public/js/app.js vendored
View File

@ -18922,11 +18922,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
id: this.car.id,
stammnummer: this.car.stammnummer,
vin: this.car.vin,
initial_date: (0,vue__WEBPACK_IMPORTED_MODULE_3__.ref)(Date.parse(this.car.initial_date)),
initial_date: (0,vue__WEBPACK_IMPORTED_MODULE_3__.ref)(new Date(this.car.initial_date)),
colour: this.car.colour,
notes: this.car.notes,
car_model_id: this.car.car_model.id,
last_check_date: (0,vue__WEBPACK_IMPORTED_MODULE_3__.ref)(Date.parse(this.car.last_check_date)),
last_check_date: (0,vue__WEBPACK_IMPORTED_MODULE_3__.ref)(new Date(this.car.last_check_date)),
kilometers: this.car.kilometers,
known_damage: this.car.known_damage
}, "notes", this.car.notes)
@ -19742,7 +19742,8 @@ __webpack_require__.r(__webpack_exports__);
type: this.type == "SellContract" ? '0' : '1',
insurance_type: '0',
car_id: this.car.id,
contact_id: this.contact.id
contact_id: this.contact.id,
is_sell_contract: this.type == "SellContract"
}
};
},
@ -20077,9 +20078,10 @@ __webpack_require__.r(__webpack_exports__);
on_success: 'Änderungen gespeichert'
},
data: {
date: (0,vue__WEBPACK_IMPORTED_MODULE_3__.ref)(Date.parse(this.contract.date)),
date: (0,vue__WEBPACK_IMPORTED_MODULE_3__.ref)(new Date(this.contract.date)),
price: this.contract.price,
insurance_type: this.contract.insurance_type
insurance_type: this.contract.insurance_type,
is_sell_contract: this.contract.is_sell_contract
}
};
}
@ -27406,7 +27408,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
"default": (0,vue__WEBPACK_IMPORTED_MODULE_0__.withCtx)(function () {
return [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)("div", null, [!$props.car_first ? ((0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createBlock)(_component_jet_form_section, {
key: 0,
emptyBg: "true",
emptyBg: true,
"class": "max-w-7xl mb-5"
}, {
title: (0,vue__WEBPACK_IMPORTED_MODULE_0__.withCtx)(function () {
@ -27432,7 +27434,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
})) : (0,vue__WEBPACK_IMPORTED_MODULE_0__.createCommentVNode)("v-if", true), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_jet_form_section, {
"class": "max-w-7xl",
emptyBg: "true"
emptyBg: true
}, {
title: (0,vue__WEBPACK_IMPORTED_MODULE_0__.withCtx)(function () {
return [_hoisted_2];
@ -27455,7 +27457,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
}), $props.car_first ? ((0,vue__WEBPACK_IMPORTED_MODULE_0__.openBlock)(), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createBlock)(_component_jet_form_section, {
key: 1,
emptyBg: "true",
emptyBg: true,
"class": "max-w-7xl mt-5"
}, {
title: (0,vue__WEBPACK_IMPORTED_MODULE_0__.withCtx)(function () {
@ -27601,7 +27603,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
"default": (0,vue__WEBPACK_IMPORTED_MODULE_0__.withCtx)(function () {
return [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)("div", null, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_jet_form_section, {
"class": "max-w-7xl",
emptyBg: "true"
emptyBg: true
}, {
title: (0,vue__WEBPACK_IMPORTED_MODULE_0__.withCtx)(function () {
return [_hoisted_2];
@ -27810,7 +27812,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
"default": (0,vue__WEBPACK_IMPORTED_MODULE_0__.withCtx)(function () {
return [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)("div", null, [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_jet_form_section, {
"class": "max-w-7xl",
emptyBg: "true"
emptyBg: true
}, {
title: (0,vue__WEBPACK_IMPORTED_MODULE_0__.withCtx)(function () {
return [(0,vue__WEBPACK_IMPORTED_MODULE_0__.createTextVNode)((0,vue__WEBPACK_IMPORTED_MODULE_0__.toDisplayString)($options.contactType), 1
@ -27963,7 +27965,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
}, null, 8
/* PROPS */
, ["text", "href"]), (0,vue__WEBPACK_IMPORTED_MODULE_0__.createVNode)(_component_bread_crumb, {
text: 'Vertrag vom ' + $props.contract.date,
text: 'Vertrag vom ' + $props.contract.date_formatted,
href: _ctx.route('contracts.show', $props.contract.id)
}, null, 8
/* PROPS */

4
resources/js/Pages/Cars/Edit.vue
View File

@ -62,11 +62,11 @@ export default {
id: this.car.id,
stammnummer: this.car.stammnummer,
vin: this.car.vin,
initial_date: ref(Date.parse(this.car.initial_date)),
initial_date: ref(new Date(this.car.initial_date)),
colour: this.car.colour,
notes: this.car.notes,
car_model_id: this.car.car_model.id,
last_check_date: ref(Date.parse(this.car.last_check_date)),
last_check_date: ref(new Date(this.car.last_check_date)),
kilometers: this.car.kilometers,
known_damage: this.car.known_damage,
notes: this.car.notes,

7
resources/js/Pages/Contracts/Create.vue
View File

@ -12,7 +12,7 @@
</template>
<div>
<jet-form-section v-if="!car_first" emptyBg="true" class="max-w-7xl mb-5">
<jet-form-section v-if="!car_first" :emptyBg="true" class="max-w-7xl mb-5">
<template #title>
{{ contactType }}
</template>
@ -23,7 +23,7 @@
<contact-card class="col-span-12" :contact="contact" />
</template>
</jet-form-section>
<jet-form-section class="max-w-7xl" emptyBg="true">
<jet-form-section class="max-w-7xl" :emptyBg="true">
<template #title>
Auto
</template>
@ -34,7 +34,7 @@
<car-card class="col-span-12" :car="car" />
</template>
</jet-form-section>
<jet-form-section v-if="car_first" emptyBg="true" class="max-w-7xl mt-5">
<jet-form-section v-if="car_first" :emptyBg="true" class="max-w-7xl mt-5">
<template #title>
{{ contactType }}
</template>
@ -94,6 +94,7 @@ export default {
insurance_type: '0',
car_id: this.car.id,
contact_id: this.contact.id,
is_sell_contract: this.type == "SellContract",
},
}
},

2
resources/js/Pages/Contracts/CreateFromCar.vue
View File

@ -8,7 +8,7 @@
</h2>
</template>
<div>
<jet-form-section class="max-w-7xl" emptyBg="true">
<jet-form-section class="max-w-7xl" :emptyBg="true">
<template #title>
Auto
</template>

2
resources/js/Pages/Contracts/CreateFromContact.vue
View File

@ -8,7 +8,7 @@
</h2>
</template>
<div>
<jet-form-section class="max-w-7xl" emptyBg="true">
<jet-form-section class="max-w-7xl" :emptyBg="true">
<template #title>
{{ contactType }}
</template>

5
resources/js/Pages/Contracts/Edit.vue
View File

@ -4,7 +4,7 @@
<h2 class="font-semibold text-xl text-gray-800 leading-tight">
<bread-crumb text="Autos" :href="route('cars')" />
<bread-crumb :text="contract.car.name" :href="route('cars.show', contract.car.id)" />
<bread-crumb :text="'Vertrag vom ' + contract.date" :href="route('contracts.show', contract.id)" />
<bread-crumb :text="'Vertrag vom ' + contract.date_formatted" :href="route('contracts.show', contract.id)" />
bearbeiten
</h2>
</template>
@ -46,9 +46,10 @@ export default {
on_success: 'Änderungen gespeichert',
},
data: {
date: ref(Date.parse(this.contract.date)),
date: ref(new Date(this.contract.date)),
price: this.contract.price,
insurance_type: this.contract.insurance_type,
is_sell_contract: this.contract.is_sell_contract,
}
}
},