Merge pull request #1232 from prabhat-webkul/fix-1172

Fixed #1172
krayin · Jun 12, 2024 · 0fb271a · 0fb271a
2 parents 36f16f1 + d9dacce
commit 0fb271a
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 26 deletions.
diff --git a/packages/Webkul/WebForm/publishable/assets/css/web-form.css b/packages/Webkul/WebForm/publishable/assets/css/web-form.css
diff --git a/packages/Webkul/WebForm/publishable/assets/js/web-form.js b/packages/Webkul/WebForm/publishable/assets/js/web-form.js
diff --git a/packages/Webkul/WebForm/publishable/assets/js/web-form.js.LICENSE.txt b/packages/Webkul/WebForm/publishable/assets/js/web-form.js.LICENSE.txt
@@ -1,33 +1,19 @@
 /*!
- * Sizzle CSS Selector Engine v2.3.6
- * https://sizzlejs.com/
- *
- * Copyright JS Foundation and other contributors
- * Released under the MIT license
- * https://js.foundation/
- *
- * Date: 2021-02-16
- */
-
-/*!
- * jQuery JavaScript Library v3.6.0
+ * jQuery JavaScript Library v3.7.1
  * https://jquery.com/
  *
- * Includes Sizzle.js
- * https://sizzlejs.com/
- *
  * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2021-03-02T17:08Z
+ * Date: 2023-08-28T13:37Z
  */
 
 /*!
- * jQuery Validation Plugin v1.19.3
+ * jQuery Validation Plugin v1.20.0
  *
  * https://jqueryvalidation.org/
  *
- * Copyright (c) 2021 Jörn Zaefferer
+ * Copyright (c) 2023 Jörn Zaefferer
  * Released under the MIT license
  */
diff --git a/packages/Webkul/WebForm/publishable/assets/mix-manifest.json b/packages/Webkul/WebForm/publishable/assets/mix-manifest.json
@@ -1,8 +1,8 @@
 {
-    "/js/web-form.js": "/js/web-form.js?id=39f03c6b9d0f9bada3ae",
-    "/css/admin.css": "/css/admin.css?id=7fc00e6e33ad6a5aed23",
-    "/css/web-form.css": "/css/web-form.css?id=9abf84a723bbe8fd98d0",
-    "/images/calendar-icon.svg": "/images/calendar-icon.svg?id=ebf1eaf60f02673fc24b",
-    "/images/close-white-icon.svg": "/images/close-white-icon.svg?id=eca0bd1d80ac3d7c9f9a",
-    "/images/web-form-icon.svg": "/images/web-form-icon.svg?id=6e4cdca809433251a6e1"
+    "/js/web-form.js": "/js/web-form.js?id=8102bfc0719e3a2d07159afdce655248",
+    "/css/admin.css": "/css/admin.css?id=7fc00e6e33ad6a5aed235f12cb625613",
+    "/css/web-form.css": "/css/web-form.css?id=d8de0318a650da7341dbf48f0879450a",
+    "/images/calendar-icon.svg": "/images/calendar-icon.svg?id=ebf1eaf60f02673fc24b2001c27104dc",
+    "/images/close-white-icon.svg": "/images/close-white-icon.svg?id=eca0bd1d80ac3d7c9f9a20ab812d4aa1",
+    "/images/web-form-icon.svg": "/images/web-form-icon.svg?id=6e4cdca809433251a6e11e17bd069cf9"
 }
diff --git a/packages/Webkul/WebForm/src/Resources/assets/sass/web-form.scss b/packages/Webkul/WebForm/src/Resources/assets/sass/web-form.scss
@@ -143,6 +143,15 @@
                             padding: 10px;
                         }
 
+                        .checkbox-control {
+                            margin-top: 10px;
+                            margin-bottom: 5px;
+
+                            .label {
+                                display: inline;
+                            }
+                        }
+
                         .control {
                             width: 100%;
                             padding: 10px;

diff --git a/packages/Webkul/WebForm/src/Resources/views/settings/web-forms/form-js/form.blade.php b/packages/Webkul/WebForm/src/Resources/views/settings/web-forms/form-js/form.blade.php
@@ -202,6 +202,30 @@ class="control"
 
                                         @break;
 
+                                    @case('checkbox')
+                                        <div class="checkbox-control">
+                                            @php
+                                                $options = $parentAttribute->lookup_type
+                                                    ? app('Webkul\Attribute\Repositories\AttributeRepository')->getLookUpOptions($parentAttribute->lookup_type)
+                                                    : $parentAttribute->options()->orderBy('sort_order')->get();
+                                            @endphp
+
+                                            @foreach ($options as $option)
+                                                <span class="checkbox">
+                                                    <input
+                                                        type="checkbox"
+                                                        name="{{ $fieldName }}[]"
+                                                        value="{{ $option->id }}"
+                                                    />
+
+                                                    <label class="checkbox-view" style="display: inline;"></label>
+                                                    {{ $option->name }}
+                                                </span>
+                                            @endforeach
+                                        </div>
+
+                                        @break;
+
                                     @case('file')
                                     @case('image')
                                         <input