Merge pull request #390 from Invizo/develop

Develop merge with master
getdokan · Mar 6, 2024 · 3349875 · 3349875
2 parents 1d1cf71 + 38f34f5
commit 3349875
Show file tree

Hide file tree

Showing 66 changed files with 1,724 additions and 26,223 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -23,4 +23,4 @@ jobs:
           SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
           SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
           SLUG: storegrowth-sales-booster
-          VERSION: 1.1.3
+          VERSION: 1.24.4
diff --git a/.gitignore b/.gitignore
@@ -3,5 +3,6 @@ node_modules
 vendor
 .idea
 lerna-debug.log
+package-lock.json
 assets/build/
 Includes/Modules/*/assets/build/
diff --git a/Includes/Modules/CountdownTimer/CountdownTimerModule.php b/Includes/Modules/CountdownTimer/CountdownTimerModule.php
@@ -55,7 +55,7 @@ public function get_banner() {
 	 * @return string
 	 */
 	public function get_name() {
-		return 'Sales Countdown';
+		return 'Countdown Timer';
 	}
 
 	/**

diff --git a/Includes/Modules/CountdownTimer/Includes/CommonHooks.php b/Includes/Modules/CountdownTimer/Includes/CommonHooks.php
@@ -57,7 +57,7 @@ public function woocommerce_product_data_tabs( $tabs ) {
 		if ( ! $this->is_external_product() ) {
 			// Adds the new tab.
 			$tabs['countdown_timer_tab'] = array(
-				'label'  => __( 'Sales Countdown', 'storegrowth-sales-booster' ),
+				'label'  => __( 'Countdown Timer', 'storegrowth-sales-booster' ),
 				'target' => 'sgsb-countdown-timer-tab',
 			);
 		}

diff --git a/Includes/Modules/CountdownTimer/assets/scripts/wpbs-style.css b/Includes/Modules/CountdownTimer/assets/scripts/wpbs-style.css
@@ -152,11 +152,13 @@ width: fit-content;
 
 }
 
+.sgsb-countdown-timer-heading.ct-layout-2.default {
+	background: linear-gradient(90deg, #32DBBE 0%, #008DFF 100%) text;
+	-webkit-text-fill-color: transparent;
+}
+
 .sgsb-countdown-timer-heading.ct-layout-2 {
-background: linear-gradient(90deg, #32DBBE 0%, #008DFF 100%);
 -webkit-background-clip: text;
--webkit-text-fill-color: transparent;
-font-family: "Merienda" !important;
 }
 
 /* layout2  styles end */

diff --git a/Includes/Modules/CountdownTimer/assets/src/components/DesignTab.js b/Includes/Modules/CountdownTimer/assets/src/components/DesignTab.js
@@ -8,6 +8,8 @@ import ActionsHandler from "sales-booster/src/components/settings/Panels/PanelSe
 
 import "../styles/countdown-timer.css";
 import Templates from "./Templates";
+import SelectBox from "sales-booster/src/components/settings/Panels/PanelSettings/Fields/SelectBox";
+import {applyFilters} from "@wordpress/hooks";
 
 function DesignTab( props ) {
   const {
@@ -21,52 +23,101 @@ function DesignTab( props ) {
     noop,
     options,
     handleSelect,
+    undoHandler,
+    showUndoIcon
   } = props;
 
+  const fontFamily = [
+    {
+      value: 'poppins',
+      label: __('Poppins', 'storegrowth-sales-booster'),
+    },
+    {
+      value: 'merienda',
+      label: __('Merienda', 'storegrowth-sales-booster'),
+    },
+    {
+      value: 'roboto',
+      label: __('Roboto', 'storegrowth-sales-booster'),
+    },
+    {
+      value: 'lato',
+      label: __('Lato', 'storegrowth-sales-booster'),
+    },
+    {
+      value: 'montserrat',
+      label: __('Montserrat', 'storegrowth-sales-booster'),
+    },
+    {
+      value: 'ibm_plex_sans',
+      label: __('IBM Plex Sans', 'storegrowth-sales-booster'),
+    },
+  ];
+
   return (
     <Fragment>
       <SettingsSection>
+        <SelectBox
+          name={`font_family`}
+          options={[...fontFamily]}
+          fieldValue={formData.font_family}
+          changeHandler={onFieldChange}
+          title={__("Font Family", "storegrowth-sales-booster")}
+          tooltip={__(
+            "Select your desired font family",
+              "storegrowth-sales-booster"
+          )}
+        />
+
         <ColourPicker
+          undoHandler={undoHandler}
           name={"widget_background_color"}
           fieldValue={formData.widget_background_color}
+          showUndoIcon={showUndoIcon?.widget_background_color}
           changeHandler={onFieldChange}
           title={__("Widget Background Color", "storegrowth-sales-booster")}
         />
 
         <ColourPicker
+          undoHandler={undoHandler}
           name={"border_color"}
           fieldValue={formData.border_color}
+          showUndoIcon={showUndoIcon?.border_color}
           changeHandler={onFieldChange}
           title={__("Border Color", "storegrowth-sales-booster")}
         />
 
         <ColourPicker
+          undoHandler={undoHandler}
           name={"heading_text_color"}
           fieldValue={formData.heading_text_color}
+          showUndoIcon={showUndoIcon?.heading_text_color}
           changeHandler={onFieldChange}
           title={__("Heading Text Color", "storegrowth-sales-booster")}
         />
+
+        {/* Rendered countdown settings. */}
+        { applyFilters(
+          'sgsb_append_countdown_design_settings',
+          '',
+          formData,
+          onFieldChange,
+          showUndoIcon,
+          undoHandler
+        ) }
+
         <ActionsHandler
           resetHandler={onFormReset}
           loadingHandler={buttonLoading}
           saveHandler={onFormSave}
         />
       </SettingsSection>
 
-      <Templates formData={ formData } setFormData={ setFormData } />
-
-      {/*<Form.Item label="Theme" labelAlign="left">*/}
-      {/*  <div className="sgsb-countdown-theme">*/}
-      {/*    {options.map((option, index) => (*/}
-      {/*      <Selector*/}
-      {/*        key={index}*/}
-      {/*        option={option}*/}
-      {/*        onSelect={() => handleSelect(option.theme)}*/}
-      {/*        isSelected={option.theme === formData.selected_theme}*/}
-      {/*      />*/}
-      {/*    ))}*/}
-      {/*  </div>*/}
-      {/*</Form.Item>*/}
+      <Templates
+        formData={ formData }
+        setFormData={ setFormData }
+        showUndoIcon={ showUndoIcon }
+      />
     </Fragment>
   );
 }