Laclic
/
LcShopBundle
Beobachten 3
Favorisieren 2
Fork 0
Code Issues 0 Pull-Requests 0 Releases 0 Wiki Aktivität
Quellcode durchsuchen

Merge branch 'develop'

master
Fab vor 4 Jahren
Ursprung
8faaa1c94c 1be289e790
Commit
1c68d58234
4 geänderte Dateien mit 32 neuen und 18 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. +1
    -1
      ShopBundle/Resources/translations/lcshop.fr.yaml
  2. +9
    -2
      ShopBundle/Resources/views/backend/default/block/action.html.twig
  3. +20
    -14
      ShopBundle/Resources/views/backend/default/layout/layout.html.twig
  4. +2
    -1
      ShopBundle/Services/ProductFamilyUtils.php

+ 1
- 1
ShopBundle/Resources/translations/lcshop.fr.yaml Datei anzeigen

@@ -12,7 +12,7 @@ list:
delete: Supprimer
send: Envoyer
duplicate: Dupliquer
duplicateOtherHub: Dupliquer sur un autre hub
duplicateOtherHub: Dupliquer sur %title%
sortProductFamily: Trier les produits de cette catégorie
group:
main: Général

+ 9
- 2
ShopBundle/Resources/views/backend/default/block/action.html.twig Datei anzeigen

@@ -1,9 +1,16 @@

{% set title = "" %}
{% if merchant is defined %}
{% set title = merchant.title %}
{% endif %}
{% if is_dropdown %}

<a class="btn dropdown-item {{ action.css_class|default('btn-default') }}"
href="{{ action_href }}{{ action.hub is defined ? '&hub='~action.hub : '' }}" target="{{ action.target }}">
{%- if action.icon %}<i class="fa fa-fw fa-{{ action.icon }}"></i> {% endif -%}
{{ action.label|trans(arguments = trans_parameters|merge({ '%entity_id%': item_id }), domain = translation_domain) }}
{{ action.label|trans(arguments = trans_parameters|merge({ '%entity_id%': item_id, '%title%': title }), domain = translation_domain) }}
</a>

{% else %}
{% if action.hub is defined %}
{% set trad = action.label~action.hub|uc_first %}
@@ -12,7 +19,7 @@
{% endif %}
<a class="btn {{ is_dropdown|default(false) ? 'dropdown-item' }} {{ action.css_class|default('btn-default') }}"
data-toggle="tooltip"
title="{{ action.label|trans(arguments = trans_parameters|merge({ '%entity_id%': item_id }), domain = translation_domain) }}"
title="{{ action.label|trans(arguments = trans_parameters|merge({ '%entity_id%': item_id, '%title%': title }), domain = translation_domain) }}"
href="{{ action_href }}{{ action.hub is defined ? '&hub='~action.hub : '' }}" target="{{ action.target }}">
{%- if action.icon %}<i class="fa fa-fw fa-{{ action.icon }}"></i> {% endif -%}
</a>

+ 20
- 14
ShopBundle/Resources/views/backend/default/layout/layout.html.twig Datei anzeigen

@@ -30,7 +30,7 @@
<!-- Google Font: Source Sans Pro -->
<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">

{#<link rel="stylesheet" href="{{ asset('bundles/easyadmin/app.css') }}">#}
{# <link rel="stylesheet" href="{{ asset('bundles/easyadmin/app.css') }}"> #}
{% endblock %}

{% block head_custom_stylesheets %}
@@ -41,11 +41,11 @@
{% endblock head_custom_stylesheets %}

{#
{% if easyadmin_config('design.brand_color') != 'hsl(230, 55%, 60%)' %}
<style>
:root { --color-primary: {{ easyadmin_config('design.brand_color') }}; }
</style>
{% endif %}
{% if easyadmin_config('design.brand_color') != 'hsl(230, 55%, 60%)' %}
<style>
:root { --color-primary: {{ easyadmin_config('design.brand_color') }}; }
</style>
{% endif %}
#}

{% block head_favicon %}
@@ -55,13 +55,14 @@
</head>

{% block body %}
<body id="pdl-body" class="{% block body_class %}sidebar-mini layout-navbar-fixed{% endblock %} {% block body_class_extend %}{% endblock %}">
<body id="pdl-body"
class="{% block body_class %}sidebar-mini layout-navbar-fixed{% endblock %} {% block body_class_extend %}{% endblock %}">
{# <script>
document.body.classList.add(
'easyadmin-content-width-' + (localStorage.getItem('easyadmin/content/width') || 'normal'),
'easyadmin-sidebar-width-' + (localStorage.getItem('easyadmin/sidebar/width') || 'normal')
);
</script>#}
</script> #}

{% block wrapper_wrapper %}
<div class="wrapper">
@@ -125,9 +126,14 @@
{% endif %}
</li>
<li>
<a target="_blank" class="btn btn-outline-success"
href="{{ merchantUtils.getMerchantUser.getMerchantConfig('url') }}">Afficher le
site</a>
{% if 'localhost' in app.request.getSchemeAndHttpHost() %}
<a target="_blank" class="btn btn-outline-success"
href="{{ app.request.getSchemeAndHttpHost() }}">Afficher le site</a>
{% else %}
<a target="_blank" class="btn btn-outline-success"
href="{{ merchantUtils.getMerchantUser.getMerchantConfig('url') }}">Afficher le
site</a>
{% endif %}
</li>
</ul>
{% endblock navbar %}
@@ -176,7 +182,7 @@
{% block global_actions_wrapper %}
<div class="global-actions">
{% block global_actions %}{% endblock %}
{#{{ dump(_request_parameters) }}#}
{# {{ dump(_request_parameters) }} #}
<button type="button" class="btn-sm btn-primary btn-add-reminder "
data-url="{{ path('easyadmin', { action: 'new', entity: 'Reminder' }) }}">
+ Ajouter pense bête
@@ -230,7 +236,7 @@
{% endblock wrapper_wrapper %}


{#Initilisation des varibles requis dans le JS #}
{# Initilisation des varibles requis dans le JS #}
<script>
const DOMAIN = "{{ app.request.getSchemeAndHttpHost() }}";
</script>
@@ -241,7 +247,7 @@
<!-- Bootstrap 4 -->
<script src="{{ asset('bundles/lcshop/js/backend/plugin/bootstrap/bootstrap.bundle.min.js') }}"></script>
<script src="{{ asset('bundles/lcshop/js/backend/plugin/toastr/toastr.min.js') }}"></script>
{#<script src="{{ asset('bundles/lcshop/js/backend/plugin/select2/select2.min.js') }}"></script>#}
{# <script src="{{ asset('bundles/lcshop/js/backend/plugin/select2/select2.min.js') }}"></script> #}
<script src="{{ asset('bundles/lcshop/js/backend/plugin/select2/select2.full.min.js') }}"></script>
<script src="{{ asset('bundles/lcshop/js/backend/plugin/bootstrap/bootstrap-switch.min.js') }}"></script>
<!-- AdminLTE App -->

+ 2
- 1
ShopBundle/Services/ProductFamilyUtils.php Datei anzeigen

@@ -142,11 +142,12 @@ class ProductFamilyUtils
$entity->addProduct($originProduct);

foreach ($entity->getProducts() as $product) {
$product->setProductFamily($entity);

if($entity->getProductsQuantityAsTitle() && $product->getStatus()>=1){
$product->setTitle(str_replace('.', ',',$product->getQuantityInherited()).$product->getUnitInherited()->getWording());
}

$product->setProductFamily($entity);
$this->em->persist($product);
$entity->addProduct($product);
}

Verfassen Vorschau
Laden…
Abbrechen
Speichern