Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

Commit

Permalink
Merge pull request #10 from mageplaza/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@haitv282
haitv282 authored Jul 16, 2020
2 parents e2e901c + f2af262 commit bf19ee0
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 13 deletions.
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"mageplaza/module-core": "^1.4.5"
},
"type": "magento2-module",
"version": "1.2.0",
"version": "1.2.1",
"license": "proprietary",
"authors": [
{
Expand Down
24 changes: 12 additions & 12 deletions etc/adminhtml/system.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<resource>Mageplaza_BetterPopup::configuration</resource>
<group id="general" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<label>General Configuration</label>
<field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Enable</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<comment>Select Yes to enable this module</comment>
Expand Down Expand Up @@ -76,7 +76,7 @@
</field>
<group id="popup_success" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Popup Success</label>
<field id="enable_coupon" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="enable_coupon" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Use Coupon</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
</field>
Expand All @@ -93,7 +93,7 @@
<field id="enable_coupon">1</field>
</depends>
</field>
<field id="coupon_pattern" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="coupon_pattern" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Coupon Pattern</label>
<comment><![CDATA[
<span>A coupon code pattern follows this rule:</span></br>
Expand All @@ -107,19 +107,19 @@
<field id="enable_coupon">1</field>
</depends>
</field>
<field id="html_success_content" sortOrder="90" type="textarea" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="html_success_content" sortOrder="90" type="textarea" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Content</label>
<comment>HTML content. Use {{coupon_code}} variable to add coupon code</comment>
</field>
<field id="enabled_fireworks" translate="label comment" type="select" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="enabled_fireworks" translate="label comment" type="select" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Show congratulation fireworks</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
</field>
</group>
</group>
<group id="where_to_show" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
<label>Where to Show</label>
<field id="which_page_to_show" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="which_page_to_show" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Page(s) to show</label>
<source_model>Mageplaza\BetterPopup\Model\Config\Source\PageToShow</source_model>
</field>
Expand Down Expand Up @@ -164,28 +164,28 @@
</group>
<group id="when_to_show" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
<label>When to Show</label>
<field id="popup_appear" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="popup_appear" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>When the popup appears</label>
<source_model>Mageplaza\BetterPopup\Model\Config\Source\Appear</source_model>
</field>
<field id="after_scroll" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="after_scroll" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>After scroll down</label>
<comment>Percentage</comment>
<depends>
<field id="popup_appear">4</field>
</depends>
</field>
<field id="delay" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="delay" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>After X seconds</label>
<depends>
<field id="popup_appear">3</field>
</depends>
</field>
<field id="cookieExp" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="cookieExp" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Popup will be shown again after</label>
<comment>days. Leave empty to redisplay the popup after 30 days</comment>
</field>
<field id="show_float_button" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="show_float_button" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Show floating button</label>
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
<comment>Click trigger to open</comment>
Expand All @@ -197,7 +197,7 @@
<field id="show_float_button">1</field>
</depends>
</field>
<field id="float_button_label" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
<field id="float_button_label" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
<label>Button label</label>
<comment>Default: Subscribe</comment>
<depends>
Expand Down
7 changes: 7 additions & 0 deletions view/frontend/web/css/source/_module.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,10 @@ img.loader {
left: 0;
}

#mp-popup-template5 img {
max-height: initial;
}

.tmp5-text-content {
font-family: sans-serif;
position: absolute;
Expand Down Expand Up @@ -457,6 +461,9 @@ img.loader {
//template 6
#mp-popup-template6 {
font-family: sans-serif;
height: fit-content;
width: fit-content;
margin: auto;
}

.tmp6-left-title {
Expand Down

0 comments on commit bf19ee0

Please sign in to comment.