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

Fix blog statistics viewcount #48

Open
wants to merge 40 commits into
base: 2.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
3e72142
Fixed the option to order without regsiter an account
thomasfrobieter May 9, 2019
cc75b6f
Create privacy.tpl
thomasfrobieter May 9, 2019
3509310
Added data protection information checkbox
thomasfrobieter May 9, 2019
6976abb
Added data protection information checkbox
thomasfrobieter May 9, 2019
b8868e2
Added data protection information checkbox
thomasfrobieter May 9, 2019
fdbc668
Added data protection information checkbox
thomasfrobieter May 9, 2019
f438155
Added data protection information checkbox
thomasfrobieter May 9, 2019
2022d61
Added data protection information checkbox
thomasfrobieter May 9, 2019
366b53a
Moved frontend_forms_form_elements_form_privacy
thomasfrobieter May 9, 2019
0ecde7c
Moved the input checkbox element into the label
thomasfrobieter May 9, 2019
3cc58a0
Moved the privacy checkbox out of the form group
thomasfrobieter May 9, 2019
3e53ab6
Fixed form captcha
thomasfrobieter May 9, 2019
525802d
moved newsletter privacy checkbox into the submit form group
thomasfrobieter May 9, 2019
cf2508c
Added error messages from Bare - already removed the none working err…
thomasfrobieter May 9, 2019
b237d03
Added Bootstrap hidden class to form-groups with fields from type "hi…
thomasfrobieter May 10, 2019
4904c09
Added bootstraps hidden class to the form-group wrapper if the field …
thomasfrobieter May 10, 2019
637287d
Added missing sitemap_index_xml templatefile
thomasfrobieter May 23, 2019
a4baf57
Update description.tpl
JPustkuchen Jun 4, 2019
d2c8989
Merge pull request #1 from JPustkuchen/patch-1
JPustkuchen Jun 4, 2019
ec08512
Fixed custom page tabs links frontend/custom/index.tpl
JPustkuchen Jun 4, 2019
72267b8
Create index.tpl
JPustkuchen Jun 13, 2019
732070d
Add files via upload
JPustkuchen Jun 13, 2019
a375925
Merge pull request #2 from webksde/JPustkuchen-add-bootstrap-document…
JPustkuchen Jun 13, 2019
1f6796a
Fixed customer type select on registration:
thomasfrobieter Jul 11, 2019
b1447f1
Added bares default select option the the register forms salutation s…
thomasfrobieter Jul 11, 2019
936fc0b
Added GPDR cookie consent banner scripts from boostrap responsive (st…
thomasfrobieter Jan 13, 2020
07c2e14
Added GDPR cookie scripts to plugin initialization (still errors with…
thomasfrobieter Jan 13, 2020
be0b2f4
Removed console log
thomasfrobieter Jan 13, 2020
126d5d1
Updated jquery.cookie-consent-manager.js and jquery.cookie-permission…
JPustkuchen Jan 13, 2020
1a61338
Added SW 5.6.4 Cookie Manager Template files
JPustkuchen Jan 13, 2020
2fd4a45
Corrected file permissions
JPustkuchen Jan 13, 2020
07875c0
Added SW 5.6.4 Cookie Manager Template files
JPustkuchen Jan 13, 2020
d578918
Added frontend_index_cookie_consent_manager block in index/index.tpl
JPustkuchen Jan 13, 2020
0cdaf46
[Intermediate commit] Further implementation of the shopware cookie c…
thomasfrobieter Jan 14, 2020
25a1455
[Intermediate commit] Further implementation of the shopware cookie c…
thomasfrobieter Jan 14, 2020
adebbc7
Improved swbt.modal.js a lot to better match SW jquery.modal.js core …
JPustkuchen Jan 16, 2020
6b12890
Fixed cookie-manager and cookie-permission integration with as little…
JPustkuchen Jan 16, 2020
a4069f4
Update index.tpl
JPustkuchen Feb 20, 2020
e9d05f1
Merge pull request #3 from webksde/$isEmotionLandingPage-Add-Not-Land…
JPustkuchen Feb 20, 2020
ffe37f0
Fix missing blog entry count
JPustkuchen Jun 10, 2020
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
3 changes: 3 additions & 0 deletions Resources/Themes/Frontend/BootstrapBare/Theme.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ public function __construct()
"jquery.form-polyfill.js",
"jquery.pseudo-text.js",
"jquery.preloader-button.js",
"jquery.invalid-tos-jump.js",
"jquery.notification-message-close.js",
"jquery.cookie-consent-manager.js",
];

$sourceJavascripts = [
Expand Down
365 changes: 365 additions & 0 deletions Resources/Themes/Frontend/BootstrapBare/documents/index.tpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,365 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="content-type" content="text/html; utf-8">
<meta name="author" content=""/>
<meta name="copyright" content="" />

<title></title>
<style type="text/css">
{block name="document_index_css"}
body {
{$Containers.Body.style}
}

div#head_logo {
{$Containers.Logo.style}
}

div#head_sender {
{$Containers.Header_Recipient.style}
}

div#header {
{$Containers.Header.style}
}

div#head_left {
{$Containers.Header_Box_Left.style}
}

div#head_right {
{$Containers.Header_Box_Right.style}
}

div#head_bottom {
{$Containers.Header_Box_Bottom.style}
}

div#content {
{$Containers.Content.style}
}

td {
{$Containers.Td.style}
}

td.name {
{$Containers.Td_Name.style}
}

td.line {
{$Containers.Td_Line.style}
}

td.head {
{$Containers.Td_Head.style}
}

#footer {
{$Containers.Footer.style}
}

#amount {
{$Containers.Content_Amount.style}
}

#sender {
{$Containers.Header_Sender.style}
}

#info {
{$Containers.Content_Info.style}
}
{/block}
</style>
</head>

<body>
{block name="document_index_body"}
{foreach from=$Pages item=positions name="pagingLoop" key=page}

{* @Deprecated: Wrong variable will be removed in next major release *}
{$postions = $positions}

<div id="head_logo">
{$Containers.Logo.value}
</div>
<div id="header">
{block name="document_index_head_left_wrapper"}
<div id="head_left">
{if $smarty.foreach.pagingLoop.first}
{block name="document_index_selectAdress"}
{assign var="address" value="billing"}
{/block}
<div id="head_sender">
{block name="document_index_address"}
{block name="document_index_address_sender"}
<p class="sender">{$Containers.Header_Sender.value}</p>
{/block}
{block name="document_index_address_base"}
{if $User.$address.company}{$User.$address.company}<br />{/if}
{if $User.$address.department}{$User.$address.department}<br />{/if}
{$User.$address.salutation|salutation}
{if {config name="displayprofiletitle"}}
{$User.$address.title}<br/>
{/if}
{$User.$address.firstname} {$User.$address.lastname}<br />
{$User.$address.street}<br />
{/block}
{block name="document_index_address_additionalAddressLines"}
{if {config name=showAdditionAddressLine1}}
{$User.$address.additional_address_line1}<br />
{/if}
{if {config name=showAdditionAddressLine2}}
{$User.$address.additional_address_line2}<br />
{/if}
{/block}
{block name="document_index_address_cityZip"}
{if {config name=showZipBeforeCity}}
{$User.$address.zipcode} {$User.$address.city}<br />
{else}
{$User.$address.city} {$User.$address.zipcode}<br />
{/if}
{/block}
{block name="document_index_address_countryData"}
{if $User.$address.state.shortcode}{$User.$address.state.shortcode} - {/if}{$User.$address.country.countryen}<br />
{/block}
{/block}
</div>
{/if}
</div>
{/block}
{block name="document_index_head_right_wrapper"}
<div id="head_right">
<strong>
{block name="document_index_head_right"}
{$Containers.Header_Box_Right.value}
{s name="DocumentIndexCustomerID"}{/s} {$User.billing.customernumber|string_format:"%06d"}<br />
{if $User.billing.ustid}
{s name="DocumentIndexUstID"}{/s} {$User.billing.ustid|replace:" ":""|replace:"-":""}<br />
{/if}
{s name="DocumentIndexOrderID"}{/s} {$Order._order.ordernumber}<br />
{s name="DocumentIndexDate"}{/s} {$Document.date}<br />
{if $Document.deliveryDate}{s name="DocumentIndexDeliveryDate"}{/s} {$Document.deliveryDate}<br />{/if}
{/block}
</strong>
</div>
{/block}
</div>

{block name="document_index_head_bottom_wrapper"}
<div id="head_bottom" style="clear:both">
{block name="document_index_head_bottom"}
<h1>{s name="DocumentIndexInvoiceNumber"}Rechnung Nr. {$Document.id}{/s}</h1>
{s name="DocumentIndexPageCounter"}Seite {$page+1} von {$Pages|@count}{/s}
{/block}
</div>
{/block}

<div id="content">
{block name="document_index_table_header"}
<table cellpadding="0" cellspacing="0" width="100%">
<tbody valign="top">
<tr>
{block name="document_index_table_head_pos"}
<td align="left" width="5%" class="head">
<strong>{s name="DocumentIndexHeadPosition"}{/s}</strong>
</td>
{/block}
{block name="document_index_table_head_nr"}
<td align="left" width="10%" class="head">
<strong>{s name="DocumentIndexHeadArticleID"}{/s}</strong>
</td>
{/block}
{block name="document_index_table_head_name"}
<td align="left" width="48%" class="head">
<strong>{s name="DocumentIndexHeadName"}{/s}</strong>
</td>
{/block}
{block name="document_index_table_head_quantity"}
<td align="right" width="5%" class="head">
<strong>{s name="DocumentIndexHeadQuantity"}{/s}</strong>
</td>
{/block}
{block name="document_index_table_head_tax"}
{if $Document.netto != true}
<td align="right" width="6%" class="head">
<strong>{s name="DocumentIndexHeadTax"}{/s}</strong>
</td>
{/if}
{/block}
{block name="document_index_table_head_price"}
{if $Document.netto != true && $Document.nettoPositions != true}
<td align="right" width="10%" class="head">
<strong>{s name="DocumentIndexHeadPrice"}{/s}</strong>
</td>
<td align="right" width="12%" class="head">
<strong>{s name="DocumentIndexHeadAmount"}{/s}</strong>
</td>
{else}
<td align="right" width="10%" class="head">
<strong>{s name="DocumentIndexHeadNet"}{/s}</strong>
</td>
<td align="right" width="12%" class="head">
<strong>{s name="DocumentIndexHeadNetAmount"}{/s}</strong>
</td>
{/if}
{/block}
</tr>
{/block}
{foreach from=$positions item=position key=number}
{block name="document_index_table_each"}
<tr>
{block name="document_index_table_pos"}
<td align="left" width="5%" valign="top">
{$number+1}
</td>
{/block}
{block name="document_index_table_nr"}
<td align="left" width="10%" valign="top">
{$position.articleordernumber|truncate:14:""}
</td>
{/block}
{block name="document_index_table_name"}
<td align="left" width="48%" valign="top">
{if $position.name == 'Versandkosten'}
{s name="DocumentIndexPositionNameShippingCosts"}{$position.name}{/s}
{else}
{s name="DocumentIndexPositionNameDefault"}{$position.name|nl2br|wordwrap:65:"<br />\n"}{/s}
{/if}
</td>
{/block}
{block name="document_index_table_quantity"}
<td align="right" width="5%" valign="top">
{$position.quantity}
</td>
{/block}
{block name="document_index_table_tax"}
{if $Document.netto != true}
<td align="right" width="6%" valign="top">
{$position.tax} %
</td>
{/if}
{/block}
{block name="document_index_table_price"}
{if $Document.netto != true && $Document.nettoPositions != true}
<td align="right" width="10%" valign="top">
{$position.price|currency}
</td>
<td align="right" width="12%" valign="top">
{$position.amount|currency}
</td>
{else}
<td align="right" width="10%" valign="top">
{$position.netto|currency}
</td>
<td align="right" width="12%" valign="top">
{$position.amount_netto|currency}
</td>
{/if}
{/block}
</tr>
{/block}
{/foreach}
</tbody>
</table>
</div>

{if $smarty.foreach.pagingLoop.last}
{block name="document_index_amount"}
<div id="amount">
<table width="300px" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<td align="right" width="100px" class="head">{s name="DocumentIndexTotalNet"}{/s}</td>
<td align="right" width="200px" class="head">{$Order._amountNetto|currency}</td>
</tr>
{if $Document.netto == false}
{foreach from=$Order._tax key=key item=tax}
<tr>
<td align="right">{s name="DocumentIndexTax"}zzgl. {$key|tax}{/s}</td>
<td align="right">{$tax|currency}</td>
</tr>
{/foreach}
{/if}
{if $Document.netto == false}
<tr>
<td align="right"><b>{s name="DocumentIndexTotal"}{/s}</b></td>
<td align="right"><b>{$Order._amount|currency}</b></td>
</tr>
{else}
<tr>
<td align="right"><b>{s name="DocumentIndexTotal"}{/s}</b></td>
<td align="right"><b>{$Order._amountNetto|currency}</b></td>
</tr>
{/if}
</tbody>
</table>
</div>
{/block}
{block name="document_index_info"}
<div id="info">
{block name="document_index_info_comment"}
{if $Document.comment}
<div style="font-size:11px;color:#333;font-weight:bold">
{$Document.comment|replace:"€":"&euro;"}
</div>
{/if}
{/block}
{block name="document_index_info_net"}
{if $Document.netto == true}
<p>{s name="DocumentIndexAdviceNet"}{/s}</p>
{/if}
<p>{s name="DocumentIndexSelectedPayment"}{/s} {$Order._payment.description}</p>
{/block}
{block name="document_index_info_voucher"}
{if $Document.voucher}
<div style="font-size:11px;color:#333;">
{s name="DocumentIndexVoucher"}
Für den nächsten Einkauf schenken wir Ihnen einen {$Document.voucher.value} {$Document.voucher.prefix} Gutschein
mit dem Code "{$Document.voucher.code}".<br />
{/s}
</div>
{/if}
{/block}
{block name="document_index_info_ordercomment"}
{if $Order._order.customercomment}
<div style="font-size:11px;color:#333;">
{s name="DocumentIndexComment"}{/s}
{$Order._order.customercomment|replace:"€":"&euro;"}
</div>
{/if}
{/block}
{block name="document_index_info_dispatch"}
{if $Order._dispatch.name}
<p>
{s name="DocumentIndexSelectedDispatch"}{/s}
{$Order._dispatch.name}
</p>
{/if}
{/block}

{$Containers.Content_Info.value}
{block name="document_index_info_currency"}
{if $Order._currency.factor != 1}{s name="DocumentIndexCurrency"}
<br>Euro Umrechnungsfaktor: {$Order._currency.factor|replace:".":","}
{/s}
{/if}
{/block}
</div>
{/block}
{/if}

{block name="document_index_footer"}
<div id="footer">
{$Containers.Footer.value}
</div>
{if !$smarty.foreach.pagingLoop.last}
<pagebreak />
{/if}
{/block}
{/foreach}
{/block}
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{extends file="documents/index.tpl"}
{block name="document_index_head_bottom"}
<h1>{s name="DocumentIndexCreditNumber"}{/s} {$Document.id}</h1>
{s name="DocumentIndexPageCounter"}Seite {$page+1} von {$Pages|@count}{/s}
{/block}
{block name="document_index_head_right"}
{$smarty.block.parent}
{if $Document.bid}{s name="DocumentIndexInvoiceID"}{/s} {$Document.bid}<br />{/if}
{/block}
Loading