Skip to content

Commit

Permalink
fixed bug for actual shopware 6 version Shape-and-Shift#7
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergey Zayarnyy (fedora linux main) committed Aug 18, 2022
1 parent 207d51d commit 55555d0
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 4 deletions.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Resources/public/administration/js/sas-maps.js

Large diffs are not rendered by default.

48 changes: 48 additions & 0 deletions src/Resources/public/static/js/sas-maps.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/*
* Copyright 2012-2016 the original author or authors
* @license MIT, see LICENSE.txt for details
*
* @author Scott Andrews
*/

/*
* Copyright 2013-2016 the original author or authors
* @license MIT, see LICENSE.txt for details
*
* @author Scott Andrews
*/

/*
* Copyright 2014-2016 the original author or authors
* @license MIT, see LICENSE.txt for details
*
* @author Michael Jackson
*/

/*
* Copyright 2014-2016 the original author or authors
* @license MIT, see LICENSE.txt for details
*
* @author Scott Andrews
*/

/*
* Copyright 2015-2016 the original author or authors
* @license MIT, see LICENSE.txt for details
*
* @author Scott Andrews
*/

/*
* Copyright 2016 the original author or authors
* @license MIT, see LICENSE.txt for details
*
* @author Scott Andrews
*/

/*
* Copyright 2014-2016 the original author or authors
* @license MIT, see LICENSE.txt for details
*
* @author Scott Andrews
*/
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{% block block_sas_maps %}
{% set id = element.id %}
{% set element = block.slots.getSlot('sasMaps') %}
<div data-cms-element-id="{{ element.id }}" style="width: 100%;">
{% sw_include "@Storefront/storefront/element/cms-element-maps.html.twig" with { 'element': element } %}
</div>
{% endblock %}
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{% block element_maps %}
{% set apitoken = config('SasMaps.config.mapboxApiKey') %}
<div class="cms-element-maps" style="height: 500px; width: 100%"
data-maps="true"
data-lat="{{ element.config.geoLat.value }}"
data-long="{{ element.config.geoLong.value }}"
data-description="{{ element.config.description.value }}"
data-mapbox="{{ element.config.mapboxStyle.value }}"
data-zoom="{{ element.config.zoom.value }}"
data-token="{{ shopware.config.SasMaps.config.mapboxApiKey }}"
data-token="{{ apitoken }}"
>
</div>
{% endblock %}
2 changes: 1 addition & 1 deletion src/Resources/views/storefront/layout/meta.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

{% block layout_head_stylesheet %}
{{ parent() }}
<link href="https://api.mapbox.com/mapbox-gl-js/v1.8.0/mapbox-gl.css" rel="stylesheet" />
<link href="https://api.mapbox.com/mapbox-gl-js/v2.9.2/mapbox-gl.css" rel="stylesheet" />
{% endblock %}

0 comments on commit 55555d0

Please sign in to comment.