diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php
index 5846c350a691..caf5c0f8dc4c 100644
--- a/app/Http/Controllers/ClientController.php
+++ b/app/Http/Controllers/ClientController.php
@@ -66,7 +66,6 @@ class ClientController extends Controller
*/
public function index()
{
-;
if(request('page'))
return $this->clientDatatable->query(request(), $this->getCurrentCompanyId());
diff --git a/app/Jobs/Client/StoreClient.php b/app/Jobs/Client/StoreClient.php
index 12d079185265..21c059e57abd 100644
--- a/app/Jobs/Client/StoreClient.php
+++ b/app/Jobs/Client/StoreClient.php
@@ -40,5 +40,7 @@ class StoreClient
$client = $clientRepo->save($this->request, $this->client);
$contacts = $clientContactRepo->save($this->request->input('contacts'), $client);
+
+ return $client;
}
}
diff --git a/app/Jobs/Company/CreateCompany.php b/app/Jobs/Company/CreateCompany.php
index 10cfb8b63ae3..ce9536e99f19 100644
--- a/app/Jobs/Company/CreateCompany.php
+++ b/app/Jobs/Company/CreateCompany.php
@@ -2,11 +2,12 @@
namespace App\Jobs\Company;
+use App\DataMapper\CompanySettings;
use App\Events\UserSignedUp;
+use App\Models\Company;
use App\Utils\Traits\MakesHash;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Http\Request;
-use App\Models\Company;
class CreateCompany
{
@@ -43,6 +44,7 @@ class CreateCompany
$company->company_key = $this->createHash();
$company->db = config('database.default');
$company->ip = request()->ip();
+ $company->settings = CompanySettings::defaults();
$company->save();
diff --git a/app/Jobs/User/CreateUser.php b/app/Jobs/User/CreateUser.php
index 758e635c260d..52d030ceacb4 100644
--- a/app/Jobs/User/CreateUser.php
+++ b/app/Jobs/User/CreateUser.php
@@ -2,9 +2,10 @@
namespace App\Jobs\User;
+use App\DataMapper\DefaultSettings;
use App\Events\User\UserCreated;
-use App\Models\User;
use App\Models\CompanyUser;
+use App\Models\User;
use App\Utils\Traits\MakesHash;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Http\Request;
@@ -54,6 +55,7 @@ class CreateUser
'account_id' => $this->account->id,
'is_owner' => 1,
'is_admin' => 1,
+ 'settings' => json_encode(DefaultSettings::userSettings()),
]);
event(new UserCreated($user));
diff --git a/public/js/client_edit.js b/public/js/client_edit.js
index 557e29a7dc25..ef4183165ac2 100644
--- a/public/js/client_edit.js
+++ b/public/js/client_edit.js
@@ -1802,12 +1802,10 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
return this.client.country_id;
},
get: function get(value) {
-
var _this3 = this;
return this.countryArray.filter(function (obj) {
return obj.id === _this3.client.country_id;
-
});
}
}
@@ -2090,9 +2088,7 @@ exports = module.exports = __webpack_require__("./node_modules/css-loader/lib/cs
// module
-
-exports.push([module.i, "\n#example-content {\n}\n.client_form {\n\tborder-bottom: 0px;\n\tborder-bottom-style: solid;\n border-bottom-color: #167090;\n}\n.menu-li {\n\tlist-style: none;\n \tpadding-left:5px;\n \twidth:200px;\n \tline-height:1.4;\n \tmargin-top:10px;\n}\na.scrollactive-item.is-active {\n color: #027093;\n font-family: helvetica;\n text-decoration: none;\n border-left-style: solid;\n border-left-color: #027093;\n padding-left:10px;\n}\na.scrollactive-item.is-active:hover {\n text-decoration: none;\n color: #027093;\n padding-left:10px;\n}\na.scrollactive-item.is-active:active {\n color: #027093;\n padding-left:10px;\n}\n.menu-list a {\n color: #939393;\n font-family: helvetica;\n text-decoration: none;\n}\n.menu-list a:hover {\n text-decoration: none;\n color: #027093;\n padding-left:5px;\n}\n.menu-list a:active {\n color: #027093;\n text-decoration: none;\n padding-left:5px;\n}\n\n", ""]);
-
+exports.push([module.i, "\n#example-content {\n}\n.client_form {\n\tborder-bottom: 0px;\n\tborder-bottom-style: solid;\n border-bottom-color: #167090;\n}\n.menu-li {\n\tlist-style: none;\n \tpadding-left:5px;\n \twidth:200px;\n \tline-height:1.4;\n \tmargin-top:10px;\n}\na.scrollactive-item.is-active {\n color: #027093;\n font-family: helvetica;\n text-decoration: none;\n border-left-style: solid;\n border-left-color: #027093;\n padding-left:10px;\n}\na.scrollactive-item.is-active:hover {\n text-decoration: none;\n\n color: #027093;\n padding-left:10px;\n}\na.scrollactive-item.is-active:active {\n color: #027093;\n padding-left:10px;\n}\n.menu-list a {\n color: #939393;\n\n font-family: helvetica;\n text-decoration: none;\n}\n.menu-list a:hover {\n text-decoration: none;\n\n color: #027093;\n padding-left:5px;\n}\n.menu-list a:active {\n color: #027093;\n text-decoration: none;\n padding-left:5px;\n}\n\n\n", ""]);
// exports
@@ -4144,9 +4140,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
var vue_1 = __importDefault(__webpack_require__("./node_modules/vue/dist/vue.common.js"));
var vue_affix_1 = __webpack_require__("./node_modules/vue-affix/dist/vue-affix.min.js");
var VueScrollactive = __webpack_require__("./node_modules/vue-scrollactive/dist/vue-scrollactive.min.js");
-
var vue_multiselect_1 = __importDefault(__webpack_require__("./node_modules/vue-multiselect/dist/vue-multiselect.min.js"));
-
vue_1.default.use(VueScrollactive);
exports.default = {
components: {
@@ -4252,7 +4246,6 @@ exports.default = {
return vue_1.default.prototype.trans('texts.language_id');
}
}
-
};
@@ -6812,10 +6805,8 @@ var render = function() {
])
])
])
-
]
)
-
}
var staticRenderFns = []
render._withStripped = true
@@ -7031,7 +7022,6 @@ var render = function() {
]),
_vm._v(" "),
!!_vm.company.settings.custom_client_contact_label1
-
? _c("div", { staticClass: "form-group row" }, [
_c(
"label",
diff --git a/public/js/client_edit.min.js b/public/js/client_edit.min.js
index 7342a33439e0..ef4183165ac2 100644
--- a/public/js/client_edit.min.js
+++ b/public/js/client_edit.min.js
@@ -1778,7 +1778,6 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
countryArray: Object.keys(this.countries).map(function (i) {
return _this.countries[i];
})
-
};
},
@@ -1786,7 +1785,6 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
shippingCountry: {
set: function set() {
-
// return this.client.shipping_country_id
},
@@ -1795,7 +1793,6 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
return this.countryArray.filter(function (obj) {
return obj.id === _this2.client.shipping_country_id;
-
});
}
},
@@ -1805,12 +1802,10 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
return this.client.country_id;
},
get: function get(value) {
-
var _this3 = this;
return this.countryArray.filter(function (obj) {
return obj.id === _this3.client.country_id;
-
});
}
}
@@ -2093,8 +2088,7 @@ exports = module.exports = __webpack_require__("./node_modules/css-loader/lib/cs
// module
-exports.push([module.i, "\n#example-content {\n}\n.client_form {\n\tborder-bottom: 0px;\n\tborder-bottom-style: solid;\n border-bottom-color: #167090;\n}\n.menu-li {\n\tlist-style: none;\n \tpadding-left:5px;\n \twidth:200px;\n \tline-height:1.4;\n \tmargin-top:10px;\n}\na.scrollactive-item.is-active {\n color: #027093;\n font-family: helvetica;\n text-decoration: none;\n border-left-style: solid;\n border-left-color: #027093;\n padding-left:10px;\n}\na.scrollactive-item.is-active:hover {\n text-decoration: none;\n color: #027093;\n padding-left:10px;\n}\na.scrollactive-item.is-active:active {\n color: #027093;\n padding-left:10px;\n}\n.menu-list a {\n color: #939393;\n font-family: helvetica;\n text-decoration: none;\n}\n.menu-list a:hover {\n text-decoration: none;\n color: #027093;\n padding-left:5px;\n}\n.menu-list a:active {\n color: #027093;\n text-decoration: none;\n padding-left:5px;\n}\n\n", ""]);
-
+exports.push([module.i, "\n#example-content {\n}\n.client_form {\n\tborder-bottom: 0px;\n\tborder-bottom-style: solid;\n border-bottom-color: #167090;\n}\n.menu-li {\n\tlist-style: none;\n \tpadding-left:5px;\n \twidth:200px;\n \tline-height:1.4;\n \tmargin-top:10px;\n}\na.scrollactive-item.is-active {\n color: #027093;\n font-family: helvetica;\n text-decoration: none;\n border-left-style: solid;\n border-left-color: #027093;\n padding-left:10px;\n}\na.scrollactive-item.is-active:hover {\n text-decoration: none;\n\n color: #027093;\n padding-left:10px;\n}\na.scrollactive-item.is-active:active {\n color: #027093;\n padding-left:10px;\n}\n.menu-list a {\n color: #939393;\n\n font-family: helvetica;\n text-decoration: none;\n}\n.menu-list a:hover {\n text-decoration: none;\n\n color: #027093;\n padding-left:5px;\n}\n.menu-list a:active {\n color: #027093;\n text-decoration: none;\n padding-left:5px;\n}\n\n\n", ""]);
// exports
@@ -4147,7 +4141,6 @@ var vue_1 = __importDefault(__webpack_require__("./node_modules/vue/dist/vue.com
var vue_affix_1 = __webpack_require__("./node_modules/vue-affix/dist/vue-affix.min.js");
var VueScrollactive = __webpack_require__("./node_modules/vue-scrollactive/dist/vue-scrollactive.min.js");
var vue_multiselect_1 = __importDefault(__webpack_require__("./node_modules/vue-multiselect/dist/vue-multiselect.min.js"));
-
vue_1.default.use(VueScrollactive);
exports.default = {
components: {
@@ -4253,7 +4246,6 @@ exports.default = {
return vue_1.default.prototype.trans('texts.language_id');
}
}
-
};
@@ -6807,887 +6799,6 @@ var render = function() {
],
1
)
-=======
- return _c("div", { staticClass: "row" }, [
- _c(
- "div",
- { staticClass: "col-2" },
- [
- _c(
- "affix",
- {
- staticClass: "menu sidebar-menu",
- staticStyle: { width: "200px" },
- attrs: {
- "relative-element-selector": "#example-content",
- offset: { top: 50, bottom: 100 },
- "scroll-affix": false
- }
- },
- [
- _c("div", { staticClass: "menu-label" }, [_c("h2")]),
- _vm._v(" "),
- _c(
- "scrollactive",
- {
- staticClass: "menu-list",
- attrs: {
- "active-class": "is-active",
- offset: 50,
- duration: 800,
- exact: true
- }
- },
- [
- _c(
- "a",
- {
- staticClass: "scrollactive-item",
- attrs: { href: "#intro", title: "Intro" }
- },
- [_vm._v("Intro")]
- ),
- _c("br"),
- _vm._v(" "),
- _c(
- "a",
- {
- staticClass: "scrollactive-item",
- attrs: { href: "#standard-affix", title: "Standard Affix" }
- },
- [_vm._v("Standard Affix")]
- ),
- _c("br"),
- _vm._v(" "),
- _c(
- "a",
- {
- staticClass: "scrollactive-item",
- attrs: { href: "#scroll-affix", title: "Scroll Affix" }
- },
- [_vm._v("Scroll Affix")]
- ),
- _c("br"),
- _vm._v(" "),
- _c(
- "a",
- {
- staticClass: "scrollactive-item",
- attrs: { href: "#markup-1", title: "Markup 1" }
- },
- [_vm._v("Markup 1")]
- ),
- _c("br"),
- _vm._v(" "),
- _c(
- "a",
- {
- staticClass: "scrollactive-item",
- attrs: { href: "#markup-2", title: "Markup 2" }
- },
- [_vm._v("Markup 2")]
- ),
- _c("br"),
- _vm._v(" "),
- _c(
- "a",
- {
- staticClass: "scrollactive-item",
- attrs: { href: "#markup-3", title: "Markup 3" }
- },
- [_vm._v("Markup 3")]
- ),
- _c("br")
- ]
- )
- ],
- 1
- )
- ],
- 1
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-10" }, [
- _c("div", { attrs: { id: "example-content" } }, [
- _c("section", { attrs: { id: "intro" } }, [
- _c("div", { staticClass: "card" }, [
- _c("div", { staticClass: "card-header bg-primary2" }, [
- _vm._v(_vm._s(_vm.trans("texts.edit_client")))
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "card-body" }, [
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ])
- ])
- ])
- ]),
- _vm._v(" "),
- _c("section", { attrs: { id: "standard-affix" } }, [
- _c("div", { staticClass: "card" }, [
- _c("div", { staticClass: "card-header bg-primary2" }, [
- _vm._v(_vm._s(_vm.trans("texts.edit_client")))
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "card-body" }, [
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ])
- ])
- ])
- ]),
- _vm._v(" "),
- _c("section", { attrs: { id: "scroll-affix" } }, [
- _c("div", { staticClass: "card" }, [
- _c("div", { staticClass: "card-header bg-primary2" }, [
- _vm._v(_vm._s(_vm.trans("texts.edit_client")))
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "card-body" }, [
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ])
- ])
- ])
- ]),
- _vm._v(" "),
- _c("section", { attrs: { id: "markup-1" } }, [
- _c("div", { staticClass: "card" }, [
- _c("div", { staticClass: "card-header bg-primary2" }, [
- _vm._v(_vm._s(_vm.trans("texts.edit_client")))
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "card-body" }, [
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ])
- ])
- ])
- ]),
- _vm._v(" "),
- _c("section", { attrs: { id: "markup-2" } }, [
- _c("div", { staticClass: "card" }, [
- _c("div", { staticClass: "card-header bg-primary2" }, [
- _vm._v(_vm._s(_vm.trans("texts.edit_client")))
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "card-body" }, [
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ])
- ])
- ])
- ]),
- _vm._v(" "),
- _c("section", { attrs: { id: "markup-3" } }, [
- _c("div", { staticClass: "card" }, [
- _c("div", { staticClass: "card-header bg-primary2" }, [
- _vm._v(_vm._s(_vm.trans("texts.edit_client")))
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "card-body" }, [
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
- ),
- _vm._v(" "),
- _c("div", { staticClass: "col-sm-9" }, [
- _c("input", {
- staticClass: "form-control",
- attrs: {
- type: "text",
- placeholder: _vm.trans("texts.client_name")
- }
- }),
- _vm._v(" "),
- _c("div", { staticClass: "text-danger" })
- ])
- ]),
- _vm._v(" "),
- _c("div", { staticClass: "form-group row" }, [
- _c(
- "label",
- {
- staticClass: "col-sm-3 col-form-label text-right",
- attrs: { for: "name" }
- },
- [_vm._v(_vm._s(_vm.trans("texts.client_name")))]
-
])
])
])
@@ -7696,7 +6807,6 @@ var render = function() {
])
]
)
-
}
var staticRenderFns = []
render._withStripped = true
@@ -7912,7 +7022,6 @@ var render = function() {
]),
_vm._v(" "),
!!_vm.company.settings.custom_client_contact_label1
-
? _c("div", { staticClass: "form-group row" }, [
_c(
"label",
@@ -7921,7 +7030,6 @@ var render = function() {
attrs: { for: "name" }
},
[_vm._v(_vm._s(_vm.company.settings.custom_client_contact_label1))]
-
),
_vm._v(" "),
_c("div", { staticClass: "col-sm-9" }, [
@@ -7969,7 +7077,6 @@ var render = function() {
: _vm._e(),
_vm._v(" "),
!!_vm.company.settings.custom_client_contact_label2
-
? _c("div", { staticClass: "form-group row" }, [
_c(
"label",
@@ -7978,7 +7085,6 @@ var render = function() {
attrs: { for: "name" }
},
[_vm._v(_vm._s(_vm.company.settings.custom_client_contact_label2))]
-
),
_vm._v(" "),
_c("div", { staticClass: "col-sm-9" }, [
@@ -8025,8 +7131,7 @@ var render = function() {
])
: _vm._e(),
_vm._v(" "),
- !!_vm.company.settings.custom_client_contact_label3
-
+ !!_vm.company.settings.custom_client_contact_label3
? _c("div", { staticClass: "form-group row" }, [
_c(
"label",
@@ -8035,7 +7140,6 @@ var render = function() {
attrs: { for: "name" }
},
[_vm._v(_vm._s(_vm.company.settings.custom_client_contact_label3))]
-
),
_vm._v(" "),
_c("div", { staticClass: "col-sm-9" }, [
@@ -8083,7 +7187,6 @@ var render = function() {
: _vm._e(),
_vm._v(" "),
!!_vm.company.settings.custom_client_contact_label4
-
? _c("div", { staticClass: "form-group row" }, [
_c(
"label",
@@ -8092,7 +7195,6 @@ var render = function() {
attrs: { for: "name" }
},
[_vm._v(_vm._s(_vm.company.settings.custom_client_contact_label4))]
-
),
_vm._v(" "),
_c("div", { staticClass: "col-sm-9" }, [
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 8486950faa31..7a3c203dad12 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,17 +1,17 @@
{
- "/js/client_list.js": "/js/client_list.js?id=b6d333a76dc9bfedb99c",
- "/js/client_edit.js": "/js/client_edit.js?id=c6857e60873f45d76585",
- "/js/client_show.js": "/js/client_show.js?id=c5c15fa08d83dd664bae",
- "/js/client_create.js": "/js/client_create.js?id=8877c717377866cb12ba",
- "/js/localization.js": "/js/localization.js?id=ae81449ec88ae5c9c0a4",
- "/js/coreui.js": "/js/coreui.js?id=713ed1bcd7251ec4523b",
+ "/js/client_list.js": "/js/client_list.js?id=88d90244e855305bcfff",
+ "/js/client_edit.js": "/js/client_edit.js?id=009c9400b6521af01875",
+ "/js/client_show.js": "/js/client_show.js?id=be7307363fb5779cdb24",
+ "/js/client_create.js": "/js/client_create.js?id=ca114ece0bbf0eb79d38",
+ "/js/localization.js": "/js/localization.js?id=85f6f7672f9cf65d9745",
+ "/js/coreui.js": "/js/coreui.js?id=9cfda6dd6df9aaeea844",
"/js/ninja.min.js": "/js/ninja.min.js?id=d41d8cd98f00b204e980",
- "/js/coreui.min.js": "/js/coreui.min.js?id=713ed1bcd7251ec4523b",
- "/js/client_show.min.js": "/js/client_show.min.js?id=c5c15fa08d83dd664bae",
- "/js/client_edit.min.js": "/js/client_edit.min.js?id=c6857e60873f45d76585",
- "/js/client_create.min.js": "/js/client_create.min.js?id=8877c717377866cb12ba",
- "/js/client_list.min.js": "/js/client_list.min.js?id=b6d333a76dc9bfedb99c",
- "/js/localization.min.js": "/js/localization.min.js?id=ae81449ec88ae5c9c0a4",
+ "/js/coreui.min.js": "/js/coreui.min.js?id=9cfda6dd6df9aaeea844",
+ "/js/client_show.min.js": "/js/client_show.min.js?id=be7307363fb5779cdb24",
+ "/js/client_edit.min.js": "/js/client_edit.min.js?id=009c9400b6521af01875",
+ "/js/client_create.min.js": "/js/client_create.min.js?id=ca114ece0bbf0eb79d38",
+ "/js/client_list.min.js": "/js/client_list.min.js?id=88d90244e855305bcfff",
+ "/js/localization.min.js": "/js/localization.min.js?id=85f6f7672f9cf65d9745",
"/css/ninja.css": "/css/ninja.css?id=28421bc494c5086ac359",
"/css/ninja.min.css": "/css/ninja.min.css?id=28421bc494c5086ac359"
}
diff --git a/resources/views/signup/index.blade.php b/resources/views/signup/index.blade.php
index e84634e8ae90..a9c7da59169e 100644
--- a/resources/views/signup/index.blade.php
+++ b/resources/views/signup/index.blade.php
@@ -119,6 +119,7 @@
+