diff --git a/.env b/.env
index 153c83b..6387d41 100644
--- a/.env
+++ b/.env
@@ -1,6 +1,6 @@
APP_NAME=VB&DH
APP_ENV=local
-APP_KEY=base64:xTuBtcPwDbu6ddAonF67xeq0aCMdh5W0/IhbFsWzAvg=
+APP_KEY=base64:lY+NQpdbfAjat285EIpGj5+ADY2Jc6yC/XlbqBspFWg=
APP_DEBUG=true
APP_URL=http://localhost
diff --git a/database/seeds/DepartmentSeeder.php b/database/seeds/DepartmentSeeder.php
index 6fbc60d..191089a 100644
--- a/database/seeds/DepartmentSeeder.php
+++ b/database/seeds/DepartmentSeeder.php
@@ -12,24 +12,24 @@ class DepartmentSeeder extends Seeder
public function run()
{
DB::table('departments')->insert([
- ['id' => 'BGD', 'name' => 'Совет управляющих', 'tel' => '0123456600'],
- ['id' => 'PKHSX', 'name' => 'Производственный отдел', 'tel' => '0123456700'],
- ['id' => 'PTCLD', 'name' => 'Phòng Tổ chức - Lao động', 'tel' => '0123456701'],
+ ['id' => 'BGD', 'name' => 'Юридический отдел', 'tel' => '0123456600'],
+ ['id' => 'PKHSX', 'name' => 'Планово-экономический отдел', 'tel' => '0123456700'],
+ ['id' => 'PTCLD', 'name' => 'Отдел кадров', 'tel' => '0123456701'],
['id' => 'PTC', 'name' => 'Финансовый отдел', 'tel' => '0123456702'],
- ['id' => 'PKTCN', 'name' => 'Отдел технологий', 'tel' => '0123456703'],
- ['id' => 'PVT', 'name' => 'Офисные принадлежности', 'tel' => '0123456704'],
- ['id' => 'PKCS', 'name' => 'Phòng KCS', 'tel' => '0123456705'],
- ['id' => 'PHCHC', 'name' => 'Phòng Hành chính - Hậu cần', 'tel' => '0123456706'],
+ ['id' => 'PKTCN', 'name' => 'Отдел ремонта и технического обслуживания', 'tel' => '0123456703'],
+ ['id' => 'PVT', 'name' => 'Отдел закупок', 'tel' => '0123456704'],
+ ['id' => 'PKCS', 'name' => 'Отдел маркетинга', 'tel' => '0123456705'],
+ ['id' => 'PHCHC', 'name' => 'Cлужба HR', 'tel' => '0123456706'],
['id' => 'PCT', 'name' => 'Политический отдел', 'tel' => '0123456707'],
- ['id' => 'PTKCN', 'name' => 'Phòng Thiết Kế - Công Nghệ', 'tel' => '0123456708'],
- ['id' => 'BATLD', 'name' => 'Ban An Toàn Lao Động', 'tel' => '0123456709'],
- ['id' => 'XDL', 'name' => 'Phân xưởng Động lực', 'tel' => '0123456710'],
- ['id' => 'XVT', 'name' => 'Phân xưởng Vỏ tàu', 'tel' => '0123456711'],
- ['id' => 'XDTCD', 'name' => 'Phân xưởng Điện tàu - Cơ điện', 'tel' => '0123456712'],
- ['id' => 'XCK', 'name' => 'Phân xưởng Cơ khí', 'tel' => '0123456713'],
- ['id' => 'XDD', 'name' => 'Phân xưởng Đà đốc', 'tel' => '0123456714'],
- ['id' => 'XVKKTDT', 'name' => 'Phân xưởng VK-KTĐT', 'tel' => '0123456715'],
- ['id' => 'XO', 'name' => 'Phân xưởng Ống', 'tel' => '0123456716'],
+ ['id' => 'PTKCN', 'name' => 'Отдел контроля качества', 'tel' => '0123456708'],
+ ['id' => 'BATLD', 'name' => 'Отдел автоматизации', 'tel' => '0123456709'],
+ ['id' => 'XDL', 'name' => 'Отдел маркетинга', 'tel' => '0123456710'],
+ ['id' => 'XVT', 'name' => 'Отдел секретариата', 'tel' => '0123456711'],
+ ['id' => 'XDTCD', 'name' => 'Отдел клиентского сервиса', 'tel' => '0123456712'],
+ ['id' => 'XCK', 'name' => 'Отдел транспортной логистики', 'tel' => '0123456713'],
+ ['id' => 'XDD', 'name' => 'Отдел продаж', 'tel' => '0123456714'],
+ ['id' => 'XVKKTDT', 'name' => 'ИТ-отдел', 'tel' => '0123456715'],
+ ['id' => 'XO', 'name' => 'Производственный отдел', 'tel' => '0123456716'],
]);
}
}
diff --git a/database/seeds/SignerSeeder.php b/database/seeds/SignerSeeder.php
index 29c69c6..3048ff3 100644
--- a/database/seeds/SignerSeeder.php
+++ b/database/seeds/SignerSeeder.php
@@ -15,7 +15,6 @@ public function run()
['name' => 'Nguyễn Thanh Toàn', 'description' => 'Главный финансовый директор'],
['name' => 'Đào Thị Xa', 'description' => 'Генеральный директор'],
['name' => 'Hoàng Công', 'description' => 'Руководитель компание'],
- ['name' => 'Nguyễn Công Quân', 'description' => null],
['name' => 'Nguyễn Đức Tiên', 'description' => 'Замдиректор'],
]);
}
diff --git a/laradock/.env.example b/laradock/.env.example
new file mode 100644
index 0000000..86ed234
--- /dev/null
+++ b/laradock/.env.example
@@ -0,0 +1,46 @@
+APP_NAME=VB&DH
+APP_ENV=local
+APP_KEY=
+APP_DEBUG=true
+APP_URL=http://localhost
+
+LOG_CHANNEL=stack
+
+DB_CONNECTION=mysql
+DB_HOST=mysql
+DB_PORT=3306
+DB_DATABASE=qlvbdh
+DB_USERNAME=default
+DB_PASSWORD=secret
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+QUEUE_CONNECTION=database
+SESSION_DRIVER=cookie
+SESSION_LIFETIME=120
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=smtp
+MAIL_HOST=in-v3.mailjet.com
+MAIL_PORT=587
+MAIL_USERNAME=2e99b04784720bfd52cacc0dde78e468
+MAIL_PASSWORD=24cc9628b13ab2040c7d2f1873973db7
+MAIL_ENCRYPTION=tls
+MAIL_FROM_ADDRESS=pantakson@gmail.com
+MAIL_FROM_NAME="${APP_NAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
\ No newline at end of file
diff --git a/public/1.js b/public/1.js
index 1cd1362..7771d69 100644
--- a/public/1.js
+++ b/public/1.js
@@ -208,7 +208,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
this.service["delete"](this.itemSelected.id).then(function (response) {
_this4.isShowDetail = false;
- _this4.$toast.success("Đã xóa");
+ _this4.$toast.success("Удалено");
_this4.fetchList();
})["catch"](function (error) {
@@ -353,7 +353,7 @@ var render = function() {
},
[
_c("CIcon", { attrs: { name: "cil-x" } }),
- _vm._v(" Xóa\n ")
+ _vm._v(" Удалить\n ")
],
1
)
diff --git a/public/20.js b/public/20.js
index b16afcc..c039006 100644
--- a/public/20.js
+++ b/public/20.js
@@ -1172,7 +1172,7 @@ var render = function() {
[
_c("CInput", {
attrs: {
- description: "Let us know your full name.",
+ description: "ФИО ",
label: "Enter your name",
horizontal: "",
autocomplete: "name"
diff --git a/public/4.js b/public/4.js
index a52b173..3e4f519 100644
--- a/public/4.js
+++ b/public/4.js
@@ -608,7 +608,7 @@ var render = function() {
_vm._v(" "),
_c("CInput", {
attrs: {
- placeholder: "Let us know your full name.",
+ placeholder: "ФИО ",
label: "Имя",
value: _vm.user.name,
horizontal: ""
diff --git a/public/57.js b/public/57.js
index a9b0a30..343b2e8 100644
--- a/public/57.js
+++ b/public/57.js
@@ -221,7 +221,7 @@ var render = function() {
[
_c("CInput", {
attrs: {
- placeholder: "Let us know your full name.",
+ placeholder: "ФИО ",
label: "Имя",
value: _vm.user.name,
horizontal: ""
@@ -378,7 +378,7 @@ var render = function() {
_vm._v(" "),
_c("CInput", {
attrs: {
- placeholder: "Nhập lại mật khẩu.",
+ placeholder: "Подтверждение пароля",
label: "Подтверждить",
type: "password",
value: _vm.user.password_confirmation,
diff --git a/public/8.js b/public/8.js
index 4b9fa5e..32ee3e7 100644
--- a/public/8.js
+++ b/public/8.js
@@ -141,7 +141,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
_services_factory__WEBPACK_IMPORTED_MODULE_1__["default"].attachment["delete"](id).then(function (response) {
_this3.attachments.splice(index, 1);
- _this3.$toast.success("Đã xóa");
+ _this3.$toast.success("Удалено");
})["catch"](function (error) {
_this3.toastHttpError(error);
});
diff --git a/resources/js/src/components/document/Attachments.vue b/resources/js/src/components/document/Attachments.vue
index 2212c71..c2881b9 100644
--- a/resources/js/src/components/document/Attachments.vue
+++ b/resources/js/src/components/document/Attachments.vue
@@ -96,7 +96,7 @@ export default {
.delete(id)
.then(response => {
this.attachments.splice(index, 1);
- this.$toast.success("Đã xóa");
+ this.$toast.success("Удалено");
})
.catch(error => {
this.toastHttpError(error);
diff --git a/resources/js/src/components/form/List.vue b/resources/js/src/components/form/List.vue
index 10444d2..1ef3df6 100644
--- a/resources/js/src/components/form/List.vue
+++ b/resources/js/src/components/form/List.vue
@@ -63,7 +63,7 @@
color="danger"
@click="onClickDelete"
>
- Xóa
+ Удалить
@@ -167,7 +167,7 @@ export default {
.delete(this.itemSelected.id)
.then(response => {
this.isShowDetail = false;
- this.$toast.success("Đã xóa");
+ this.$toast.success("Удалено");
this.fetchList();
})
.catch(error => {
diff --git a/resources/js/src/components/user/Info.vue b/resources/js/src/components/user/Info.vue
index bfa1c98..cbe6a14 100644
--- a/resources/js/src/components/user/Info.vue
+++ b/resources/js/src/components/user/Info.vue
@@ -7,7 +7,7 @@