Merge pull request #1265 from krayin/workflow-ui

workflow ui fixed.
krayin · Jun 21, 2024 · 8eedf6c · 8eedf6c
2 parents c8216e8 + b453cb1
commit 8eedf6c
Show file tree

Hide file tree

Showing 13 changed files with 193 additions and 81 deletions.
diff --git a/.env.example b/.env.example
@@ -1,6 +1,6 @@
 APP_NAME='Krayin CRM'
 APP_ENV=local
-APP_VERSION=1.2.4
+APP_VERSION=1.3.0
 APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost

diff --git a/packages/Webkul/Admin/publishable/assets/css/admin.css b/packages/Webkul/Admin/publishable/assets/css/admin.css
diff --git a/packages/Webkul/Admin/publishable/assets/mix-manifest.json b/packages/Webkul/Admin/publishable/assets/mix-manifest.json
@@ -1,6 +1,6 @@
 {
     "/js/admin.js": "/js/admin.js?id=ded43dfc84d1a6b469709c56aeee570a",
-    "/css/admin.css": "/css/admin.css?id=7b0ac9810258e4ee35be6823da12abaa",
+    "/css/admin.css": "/css/admin.css?id=16ecd198f0b86192d409eb3bac6fa3b8",
     "/images/activities-active-icon.svg": "/images/activities-active-icon.svg?id=f7887e3fdcddf68567ceca8facc1e40e",
     "/images/activities-icon.svg": "/images/activities-icon.svg?id=0755224d86e0281d031f938b2aa1d610",
     "/images/attribute-icon.svg": "/images/attribute-icon.svg?id=8f9f3e0e90496263403fc26efef8614d",

diff --git a/packages/Webkul/Admin/src/Resources/assets/sass/app.scss b/packages/Webkul/Admin/src/Resources/assets/sass/app.scss
@@ -2549,7 +2549,28 @@ input[type=radio] {
     clear: both;
 }
 
-.help{
+.webhook-headers {
+    display: flex;
+    gap: 5px;
+    align-items: center;
+
+    .webhook-header-items{
+        display: flex;
+        gap: 5px;
+    }
+
+    .remove-header {
+        margin-bottom: 20px;
+    }
+}
+
+.webhook-request-body {
+    display: flex;
+    gap: 10px;
+    align-items: center;
+}
+
+.help {
     font-style: italic;
     font-size: 16px;
 }
diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
@@ -646,6 +646,7 @@
                 'add-webhook'                => 'تفعيل الويب هوك',
                 'webhook_heading'            => 'إعدادات الويب هوك',
                 'webhook_url'                => 'أدخل الرابط',
+                'request-headers'            => 'عناوين الجسم',
                 'webhook_request_method'     => 'طريقة الطلب',
                 'get_method'                 => 'GET',
                 'post_method'                => 'POST',
@@ -655,9 +656,10 @@
                 'webhook_encoding'           => 'اختر الترميز',
                 'encoding_json'              => 'JSON',
                 'encoding_http_query'        => 'X-www-form-urlencoded',
-                'request_body'               => 'جسم الطلب',
+                'request_body'              => 'مفتاح وقيمة',
+                'request_body_info'         => 'أضف زوج مفتاح وقيمة في سطر جديد، أي، مفتاح=قيمة',
                 'simple_body'                => 'بسيط',
-                'custom_body'                => 'مخصص',
+                'raw'                        => 'خام',
                 'lead'                       => 'رصيد',
                 'person'                     => 'شخص',
                 'quote'                      => 'اقتباس',

diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -646,6 +646,7 @@
                 'add-webhook'                => 'Trigger webhook',
                 'webhook_heading'            => 'Webhook settings',
                 'webhook_url'                => 'Enter URL',
+                'request-headers'            => 'Request Headers',
                 'webhook_request_method'     => 'Request method',
                 'get_method'                 => 'GET',
                 'post_method'                => 'POST',
@@ -655,9 +656,10 @@
                 'webhook_encoding'           => 'Select encoding',
                 'encoding_json'              => 'JSON',
                 'encoding_http_query'        => 'X-www-form-urlencoded',
-                'request_body'               => 'Request body',
+                'request_body'              => 'Request Body',
+                'request_body_info'         => 'Add key value pair in new line, i.e., key=value',
                 'simple_body'                => 'Simple',
-                'custom_body'                => 'Custom',
+                'raw'                        => 'Raw',
                 'lead'                       => 'Lead',
                 'person'                     => 'Person',
                 'quote'                      => 'Quote',

diff --git a/packages/Webkul/Admin/src/Resources/lang/es/app.php b/packages/Webkul/Admin/src/Resources/lang/es/app.php
@@ -646,6 +646,7 @@
                 'add-webhook'                => 'Disparar webhook',
                 'webhook_heading'            => 'Configuración del webhook',
                 'webhook_url'                => 'Ingresar URL',
+                'request-headers'            => 'Encabezados del cuerpo',
                 'webhook_request_method'     => 'Método de solicitud',
                 'get_method'                 => 'GET',
                 'post_method'                => 'POST',
@@ -655,9 +656,10 @@
                 'webhook_encoding'           => 'Seleccionar codificación',
                 'encoding_json'              => 'JSON',
                 'encoding_http_query'        => 'X-www-form-urlencoded',
-                'request_body'               => 'Cuerpo de la solicitud',
+                'request_body'              => 'Clave y Valor',
+                'request_body_info'         => 'Agregar par clave-valor en una nueva línea, es decir, clave=valor',
                 'simple_body'                => 'Simple',
-                'custom_body'                => 'Personalizado',
+                'raw'                        => 'kruda',
                 'lead'                       => 'Prospecto',
                 'person'                     => 'Persona',
                 'quote'                      => 'Cita',

diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
@@ -646,6 +646,7 @@
                 'add-webhook'                => 'فعال‌سازی وب‌هوک',
                 'webhook_heading'            => 'تنظیمات وب‌هوک',
                 'webhook_url'                => 'آدرس URL را وارد کنید',
+                'request-headers'            => 'سربرگ‌های بدن',
                 'webhook_request_method'     => 'روش درخواست',
                 'get_method'                 => 'GET',
                 'post_method'                => 'POST',
@@ -655,9 +656,10 @@
                 'webhook_encoding'           => 'انتخاب رمزگذاری',
                 'encoding_json'              => 'JSON',
                 'encoding_http_query'        => 'X-www-form-urlencoded',
-                'request_body'               => 'بدنه درخواست',
-                'simple_body'                => 'ساده',
-                'custom_body'                => 'سفارشی',
+                'request_body'              => 'کلید و مقدار',
+                'request_body_info'         => 'افزودن زوج کلید و مقدار در خط جدید، یعنی، کلید=مقدار',
+                'simple_body'                => 'خام',
+                'raw'                        => '',
                 'lead'                       => 'سرنخ',
                 'person'                     => 'شخص',
                 'quote'                      => 'پیشنهاد',

diff --git a/packages/Webkul/Admin/src/Resources/lang/tr/app.php b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
@@ -646,6 +646,7 @@
                 'add-webhook'                => 'Web kancası tetikle',
                 'webhook_heading'            => 'Web kancası ayarları',
                 'webhook_url'                => 'URL girin',
+                'request-headers'            => 'Vücut Başlıkları',
                 'webhook_request_method'     => 'İstek yöntemi',
                 'get_method'                 => 'GET',
                 'post_method'                => 'POST',
@@ -655,9 +656,10 @@
                 'webhook_encoding'           => 'Kodlamayı seçin',
                 'encoding_json'              => 'JSON',
                 'encoding_http_query'        => 'X-www-form-urlencoded',
-                'request_body'               => 'İstek gövdesi',
+                'request_body'              => 'Anahtar ve Değer',
+                'request_body_info'         => 'Yeni bir satırda anahtar-değer çifti ekleyin, yani, anahtar=değer',
                 'simple_body'                => 'Basit',
-                'custom_body'                => 'Özel',
+                'raw'                        => 'çiğ',
                 'lead'                       => 'Potansiyel müşteri',
                 'person'                     => 'Kişi',
                 'quote'                      => 'Alıntı',