Skip to content

Commit 8eedf6c

Browse files
jitendra-webkuljitendra-webkul
authored
Merge pull request #1265 from krayin/workflow-ui
workflow ui fixed.
2 parents c8216e8 + b453cb1 commit 8eedf6c

File tree

13 files changed

+193
-81
lines changed

13 files changed

+193
-81
lines changed

‎.env.example‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
APP_NAME='Krayin CRM'
22
APP_ENV=local
3-
APP_VERSION=1.2.4
3+
APP_VERSION=1.3.0
44
APP_KEY=
55
APP_DEBUG=true
66
APP_URL=http://localhost

‎packages/Webkul/Admin/publishable/assets/css/admin.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/Webkul/Admin/publishable/assets/mix-manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"/js/admin.js": "/js/admin.js?id=ded43dfc84d1a6b469709c56aeee570a",
3-
"/css/admin.css": "/css/admin.css?id=7b0ac9810258e4ee35be6823da12abaa",
3+
"/css/admin.css": "/css/admin.css?id=16ecd198f0b86192d409eb3bac6fa3b8",
44
"/images/activities-active-icon.svg": "/images/activities-active-icon.svg?id=f7887e3fdcddf68567ceca8facc1e40e",
55
"/images/activities-icon.svg": "/images/activities-icon.svg?id=0755224d86e0281d031f938b2aa1d610",
66
"/images/attribute-icon.svg": "/images/attribute-icon.svg?id=8f9f3e0e90496263403fc26efef8614d",

‎packages/Webkul/Admin/src/Resources/assets/sass/app.scss‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2549,7 +2549,28 @@ input[type=radio] {
25492549
clear: both;
25502550
}
25512551

2552-
.help{
2552+
.webhook-headers {
2553+
display: flex;
2554+
gap: 5px;
2555+
align-items: center;
2556+
2557+
.webhook-header-items{
2558+
display: flex;
2559+
gap: 5px;
2560+
}
2561+
2562+
.remove-header {
2563+
margin-bottom: 20px;
2564+
}
2565+
}
2566+
2567+
.webhook-request-body {
2568+
display: flex;
2569+
gap: 10px;
2570+
align-items: center;
2571+
}
2572+
2573+
.help {
25532574
font-style: italic;
25542575
font-size: 16px;
25552576
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,6 +646,7 @@
646646
'add-webhook' => 'تفعيل الويب هوك',
647647
'webhook_heading' => 'إعدادات الويب هوك',
648648
'webhook_url' => 'أدخل الرابط',
649+
'request-headers' => 'عناوين الجسم',
649650
'webhook_request_method' => 'طريقة الطلب',
650651
'get_method' => 'GET',
651652
'post_method' => 'POST',
@@ -655,9 +656,10 @@
655656
'webhook_encoding' => 'اختر الترميز',
656657
'encoding_json' => 'JSON',
657658
'encoding_http_query' => 'X-www-form-urlencoded',
658-
'request_body' => 'جسم الطلب',
659+
'request_body' => 'مفتاح وقيمة',
660+
'request_body_info' => 'أضف زوج مفتاح وقيمة في سطر جديد، أي، مفتاح=قيمة',
659661
'simple_body' => 'بسيط',
660-
'custom_body' => 'مخصص',
662+
'raw' => 'خام',
661663
'lead' => 'رصيد',
662664
'person' => 'شخص',
663665
'quote' => 'اقتباس',

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,6 +646,7 @@
646646
'add-webhook' => 'Trigger webhook',
647647
'webhook_heading' => 'Webhook settings',
648648
'webhook_url' => 'Enter URL',
649+
'request-headers' => 'Request Headers',
649650
'webhook_request_method' => 'Request method',
650651
'get_method' => 'GET',
651652
'post_method' => 'POST',
@@ -655,9 +656,10 @@
655656
'webhook_encoding' => 'Select encoding',
656657
'encoding_json' => 'JSON',
657658
'encoding_http_query' => 'X-www-form-urlencoded',
658-
'request_body' => 'Request body',
659+
'request_body' => 'Request Body',
660+
'request_body_info' => 'Add key value pair in new line, i.e., key=value',
659661
'simple_body' => 'Simple',
660-
'custom_body' => 'Custom',
662+
'raw' => 'Raw',
661663
'lead' => 'Lead',
662664
'person' => 'Person',
663665
'quote' => 'Quote',

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,6 +646,7 @@
646646
'add-webhook' => 'Disparar webhook',
647647
'webhook_heading' => 'Configuración del webhook',
648648
'webhook_url' => 'Ingresar URL',
649+
'request-headers' => 'Encabezados del cuerpo',
649650
'webhook_request_method' => 'Método de solicitud',
650651
'get_method' => 'GET',
651652
'post_method' => 'POST',
@@ -655,9 +656,10 @@
655656
'webhook_encoding' => 'Seleccionar codificación',
656657
'encoding_json' => 'JSON',
657658
'encoding_http_query' => 'X-www-form-urlencoded',
658-
'request_body' => 'Cuerpo de la solicitud',
659+
'request_body' => 'Clave y Valor',
660+
'request_body_info' => 'Agregar par clave-valor en una nueva línea, es decir, clave=valor',
659661
'simple_body' => 'Simple',
660-
'custom_body' => 'Personalizado',
662+
'raw' => 'kruda',
661663
'lead' => 'Prospecto',
662664
'person' => 'Persona',
663665
'quote' => 'Cita',

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -646,6 +646,7 @@
646646
'add-webhook' => 'فعال‌سازی وب‌هوک',
647647
'webhook_heading' => 'تنظیمات وب‌هوک',
648648
'webhook_url' => 'آدرس URL را وارد کنید',
649+
'request-headers' => 'سربرگ‌های بدن',
649650
'webhook_request_method' => 'روش درخواست',
650651
'get_method' => 'GET',
651652
'post_method' => 'POST',
@@ -655,9 +656,10 @@
655656
'webhook_encoding' => 'انتخاب رمزگذاری',
656657
'encoding_json' => 'JSON',
657658
'encoding_http_query' => 'X-www-form-urlencoded',
658-
'request_body' => 'بدنه درخواست',
659-
'simple_body' => 'ساده',
660-
'custom_body' => 'سفارشی',
659+
'request_body' => 'کلید و مقدار',
660+
'request_body_info' => 'افزودن زوج کلید و مقدار در خط جدید، یعنی، کلید=مقدار',
661+
'simple_body' => 'خام',
662+
'raw' => '',
661663
'lead' => 'سرنخ',
662664
'person' => 'شخص',
663665
'quote' => 'پیشنهاد',

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -646,6 +646,7 @@
646646
'add-webhook' => 'Web kancası tetikle',
647647
'webhook_heading' => 'Web kancası ayarları',
648648
'webhook_url' => 'URL girin',
649+
'request-headers' => 'Vücut Başlıkları',
649650
'webhook_request_method' => 'İstek yöntemi',
650651
'get_method' => 'GET',
651652
'post_method' => 'POST',
@@ -655,9 +656,10 @@
655656
'webhook_encoding' => 'Kodlamayı seçin',
656657
'encoding_json' => 'JSON',
657658
'encoding_http_query' => 'X-www-form-urlencoded',
658-
'request_body' => 'İstek gövdesi',
659+
'request_body' => 'Anahtar ve Değer',
660+
'request_body_info' => 'Yeni bir satırda anahtar-değer çifti ekleyin, yani, anahtar=değer',
659661
'simple_body' => 'Basit',
660-
'custom_body' => 'Özel',
662+
'raw' => 'çiğ',
661663
'lead' => 'Potansiyel müşteri',
662664
'person' => 'Kişi',
663665
'quote' => 'Alıntı',

0 commit comments

Comments
 (0)