Skip to content

Commit f9b3b1c

Browse files
committed
Issue #2271 has been fixed.
1 parent 6d68eb2 commit f9b3b1c

File tree

8 files changed

+25
-3
lines changed

8 files changed

+25
-3
lines changed

packages/Webkul/Admin/src/Http/Controllers/Settings/PipelineController.php

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,24 @@ public function update(PipelineForm $request, int $id): RedirectResponse
7979
{
8080
$request->validated();
8181

82-
$request->merge([
83-
'is_default' => request()->has('is_default') ? 1 : 0,
84-
]);
82+
$isDefault = request()->has('is_default') ? 1 : 0;
83+
84+
if (! $isDefault) {
85+
$defaultCount = $this->pipelineRepository->findWhere(['is_default' => 1])->count();
86+
87+
$pipeline = $this->pipelineRepository->find($id);
88+
89+
if (
90+
$defaultCount === 1
91+
&& $pipeline->is_default
92+
) {
93+
session()->flash('error', trans('admin::app.settings.pipelines.index.default-required'));
94+
95+
return redirect()->back();
96+
}
97+
}
98+
99+
$request->merge(['is_default' => $isDefault]);
85100

86101
Event::dispatch('settings.pipeline.update.before', $id);
87102

packages/Webkul/Admin/src/Resources/lang/ar/app.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,6 +1269,7 @@
12691269
'create-btn' => 'إنشاء خط أنابيب',
12701270
'create-success' => 'تم إنشاء خط الأنابيب بنجاح.',
12711271
'update-success' => 'تم تحديث خط الأنابيب بنجاح.',
1272+
'default-required' => 'مطلوب وجود خط أنابيب افتراضي واحد على الأقل.',
12721273
'delete-success' => 'تم حذف خط الأنابيب بنجاح.',
12731274
'delete-failed' => 'لا يمكن حذف خط الأنابيب.',
12741275
'default-delete-error' => 'لا يمكن حذف خط الأنابيب الافتراضي.',

packages/Webkul/Admin/src/Resources/lang/en/app.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,6 +1271,7 @@
12711271
'create-btn' => 'Create Pipeline',
12721272
'create-success' => 'Pipeline created successfully.',
12731273
'update-success' => 'Pipeline updated successfully.',
1274+
'default-required' => 'At least one default pipeline is required.',
12741275
'delete-success' => 'Pipeline deleted successfully.',
12751276
'delete-failed' => 'Pipeline can not be deleted.',
12761277
'default-delete-error' => 'Default pipeline can not be deleted.',

packages/Webkul/Admin/src/Resources/lang/es/app.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,6 +1271,7 @@
12711271
'title' => 'Canales',
12721272
'create-btn' => 'Crear Canal',
12731273
'create-success' => 'Canal creado exitosamente.',
1274+
'default-required' => 'Se requiere al menos una canalización predeterminada.',
12741275
'update-success' => 'Canal actualizado exitosamente.',
12751276
'delete-success' => 'Canal eliminado exitosamente.',
12761277
'delete-failed' => 'No se puede eliminar el Canal.',

packages/Webkul/Admin/src/Resources/lang/fa/app.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,6 +1274,7 @@
12741274
'create-btn' => 'ایجاد پایپ‌لاین',
12751275
'create-success' => 'پایپ‌لاین با موفقیت ایجاد شد.',
12761276
'update-success' => 'پایپ‌لاین با موفقیت به‌روزرسانی شد.',
1277+
'default-required' => 'حداقل یک پایپ‌لاین پیش‌فرض مورد نیاز است.',
12771278
'delete-success' => 'پایپ‌لاین با موفقیت حذف شد.',
12781279
'delete-failed' => 'پایپ‌لاین قابل حذف نیست.',
12791280
'default-delete-error' => 'پایپ‌لاین پیش‌فرض قابل حذف نیست.',

packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1265,6 +1265,7 @@
12651265
'title' => 'Funis',
12661266
'create-btn' => 'Adicionar Funil',
12671267
'create-success' => 'Funil adicionado com sucesso.',
1268+
'default-required' => 'É necessário pelo menos um pipeline padrão.',
12681269
'update-success' => 'Funil atualizado com sucesso.',
12691270
'delete-success' => 'Funil excluído com sucesso.',
12701271
'delete-failed' => 'Não foi possível excluir o funil.',

packages/Webkul/Admin/src/Resources/lang/tr/app.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1272,6 +1272,7 @@
12721272
'title' => 'Pipelines',
12731273
'create-btn' => 'Pipeline Oluştur',
12741274
'create-success' => 'Pipeline başarıyla oluşturuldu.',
1275+
'default-required' => 'En az bir varsayılan boru hattı gereklidir.',
12751276
'update-success' => 'Pipeline başarıyla güncellendi.',
12761277
'delete-success' => 'Pipeline başarıyla silindi.',
12771278
'delete-failed' => 'Pipeline silinemedi.',

packages/Webkul/Admin/src/Resources/lang/vi/app.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,6 +1268,7 @@
12681268
'title' => 'Quy Trình',
12691269
'create-btn' => 'Tạo Quy Trình',
12701270
'create-success' => 'Quy trình đã được tạo thành công.',
1271+
'default-required' => 'Cần ít nhất một pipeline mặc định.',
12711272
'update-success' => 'Quy trình đã được cập nhật thành công.',
12721273
'delete-success' => 'Quy trình đã được xóa thành công.',
12731274
'delete-failed' => 'Quy trình không thể bị xóa.',

0 commit comments

Comments
 (0)