Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Option added to remove the "Pricealarm" feature #71

Closed
wants to merge 5 commits into from
Closed

Option added to remove the "Pricealarm" feature #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df67c16
Merge pull request #1 from OXID-eSales/master
martin-hofer Jul 20, 2019
a0b08d9
Merge pull request #2 from OXID-eSales/master
martin-hofer Jul 31, 2019
70ca55c
Merge pull request #3 from OXID-eSales/master
martin-hofer Aug 1, 2019
f2e4754
Merge pull request #5 from OXID-eSales/master
martin-hofer Aug 17, 2019
57ca0f3
Checkbox "use pricealarm" added to theme settings
martin-hofer Aug 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions de/theme_options.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@
'SHOP_THEME_sBackgroundSize_contain' => 'deckend (volle Breite)',
'SHOP_THEME_sBackgroundSize_normal' => 'Originalgröße behalten',
'SHOP_THEME_blBackgroundAttachment' => 'Soll das Hintergrundbild beim Scrollen stehen bleiben?',
'SHOP_THEME_bl_showPriceAlarm' => 'Preisalarm aktivieren',

'SHOP_THEME_blUseGoogleTS' => 'Google Zertifizierte Händler benutzen',
'SHOP_THEME_sGoogleVendorId' => 'Google Store-ID (Erforderlich)',
Expand Down
1 change: 1 addition & 0 deletions en/theme_options.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@
'SHOP_THEME_sBackgroundSize_contain' => 'cover (full width)',
'SHOP_THEME_sBackgroundSize_normal' => 'Keep original size',
'SHOP_THEME_blBackgroundAttachment' => 'Fix background while scrolling?',
'SHOP_THEME_bl_showPriceAlarm' => 'Use Pricealarm',

'SHOP_THEME_blUseGoogleTS' => 'Use Google Trusted Stores',
'SHOP_THEME_sGoogleVendorId' => 'Google Store-ID',
Expand Down
3 changes: 2 additions & 1 deletion setup.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ INSERT INTO `oxconfigdisplay` (`OXID`, `OXCFGMODULE`, `OXCFGVARNAME`, `OXGROUPIN
(uuid(), 'theme:wave', 'bl_showWishlist', 'features', '', 8, NOW()),
(uuid(), 'theme:wave', 'bl_showVouchers', 'features', '', 9, NOW()),
(uuid(), 'theme:wave', 'bl_showGiftWrapping', 'features', '', 10, NOW()),
(uuid(), 'theme:wave', 'bl_showPriceAlarm', 'features', '', 11, NOW()),
(uuid(), 'theme:wave', 'blShowBirthdayFields', 'display', '', 14, NOW()),
(uuid(), 'theme:wave', 'blShowFinalStep', 'display', '', 16, NOW()),
(uuid(), 'theme:wave', 'sManufacturerIconsize', 'images', '', 6, NOW()),
Expand Down Expand Up @@ -141,4 +142,4 @@ INSERT INTO `oxconfigdisplay` (`OXID`, `OXCFGMODULE`, `OXCFGVARNAME`, `OXGROUPIN
(uuid(), 'theme:wave', 'blFooterShowNewsletter', 'footer', '', 4, NOW()),
(uuid(), 'theme:wave', 'blFooterShowNewsletterForm', 'footer', '', 5, NOW()),
(uuid(), 'theme:wave', 'blEmailsShowProductPictures', 'emails', '', 1, NOW()),
(uuid(), 'theme:wave', 'blFooterShowNews', 'footer', '', 6, NOW());
(uuid(), 'theme:wave', 'blFooterShowNews', 'footer', '', 6, NOW());
12 changes: 12 additions & 0 deletions theme.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,18 @@
'type' => 'bool',
'value' => 1,
),
array(
'group' => 'features',
'name' => 'bl_showWishlist',
'type' => 'bool',
'value' => 1,
),
array(
'group' => 'features',
'name' => 'bl_showPriceAlarm',
'type' => 'bool',
'value' => 1,
),
array(
'group' => 'background',
'name' => 'blBackgroundAttachment',
Expand Down
20 changes: 11 additions & 9 deletions tpl/page/details/inc/tabs.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,17 @@
[{/if}]
[{/block}]

[{block name="details_tabs_pricealarm"}]
[{if $oView->isPriceAlarm() && !$oDetailsProduct->isParentNotBuyable()}]
[{capture append="tabs"}]<a class="nav-link[{if $blFirstTab}] active[{/if}]" href="#pricealarm" data-toggle="tab">[{oxmultilang ident="PRICE_ALERT"}]</a>[{/capture}]
[{capture append="tabsContent"}]
<div id="pricealarm" class="tab-pane[{if $blFirstTab}] active[{/if}]">[{include file="form/pricealarm.tpl"}]</div>
[{assign var="blFirstTab" value=false}]
[{/capture}]
[{/if}]
[{/block}]
[{if $oViewConf->getViewThemeParam('bl_showPriceAlarm')}]
[{block name="details_tabs_pricealarm"}]
[{if $oView->isPriceAlarm() && !$oDetailsProduct->isParentNotBuyable()}]
[{capture append="tabs"}]<a class="nav-link[{if $blFirstTab}] active[{/if}]" href="#pricealarm" data-toggle="tab">[{oxmultilang ident="PRICE_ALERT"}]</a>[{/capture}]
[{capture append="tabsContent"}]
<div id="pricealarm" class="tab-pane[{if $blFirstTab}] active[{/if}]">[{include file="form/pricealarm.tpl"}]</div>
[{assign var="blFirstTab" value=false}]
[{/capture}]
[{/if}]
[{/block}]
[{/if}]

[{block name="details_tabs_tags"}]
[{/block}]
Expand Down