Merge pull request #46 from Oksydan/develop

New version 2.3.2 (missing version 2.3.1 🙈 )
Oksydan · Oct 23, 2023 · ee32db9 · ee32db9
2 parents a9bacc7 + 51a0be7
commit ee32db9
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/config/admin/services.yml b/config/admin/services.yml
@@ -53,12 +53,12 @@ services:
   oksydan.is_imageslider.handler.file_uploader:
     class: 'Oksydan\IsImageslider\Handler\FileUploader'
     arguments:
-      $targetDirectory: '%images_directory%'
+      $targetDirectory: '%is_imageslider_images_directory%'
 
   oksydan.is_imageslider.handler.file_eraser:
     class: 'Oksydan\IsImageslider\Handler\FileEraser'
     arguments:
-      $targetDirectory: '%images_directory%'
+      $targetDirectory: '%is_imageslider_images_directory%'
 
 
   #creation/edition form
@@ -68,7 +68,7 @@ services:
       - '@oksydan.is_imageslider.repository.image_slider'
       - '@oksydan.is_imageslider.provider.image_provider'
       - '@prestashop.core.admin.lang.repository'
-      - '%placeholder_img%'
+      - '%is_imageslider_placeholder_img%'
       - '@prestashop.adapter.shop.context'
 
   oksydan.is_imageslider.form.identifiable_object.builder.image_slider_form_builder:
@@ -188,4 +188,4 @@ services:
     class: 'Oksydan\IsImageslider\Provider\ImageProvider'
     public: true
     arguments:
-      - '%images_uri%'
+      - '%is_imageslider_images_uri%'
diff --git a/config/common.yml b/config/common.yml
@@ -1,8 +1,8 @@
 parameters:
-  images_directory: '%kernel.project_dir%/modules/is_imageslider/img/'
-  module_uri: !php/const _MODULE_DIR_
-  images_uri: '%module_uri%is_imageslider/img/'
-  placeholder_img: '/modules/is_imageslider/views/img/placeholder.jpeg'
+  is_imageslider_images_directory: '%kernel.project_dir%/modules/is_imageslider/img/'
+  is_imageslider_module_uri: !php/const _MODULE_DIR_
+  is_imageslider_images_uri: '%is_imageslider_module_uri%is_imageslider/img/'
+  is_imageslider_placeholder_img: '/modules/is_imageslider/views/img/placeholder.jpeg'
 
 services:
   _defaults:
@@ -33,8 +33,8 @@ services:
     class: Oksydan\IsImageslider\Presenter\ImageSlidePresenter
     public: true
     arguments:
-      - '%images_uri%'
-      - '%images_directory%'
+      - '%is_imageslider_images_uri%'
+      - '%is_imageslider_images_directory%'
       - "@=service('prestashop.adapter.legacy.context').getContext()"
 
   oksydan.is_imageslider.configuration.slider_configuration:

diff --git a/is_imageslider.php b/is_imageslider.php
@@ -30,7 +30,7 @@ public function __construct()
          * https://www.waynet.pl/
          */
         $this->author = 'Igor Stępień';
-        $this->version = '2.3.0';
+        $this->version = '2.3.2';
         $this->need_instance = 0;
 
         $this->bootstrap = true;

diff --git a/src/Entity/ImageSlider.php b/src/Entity/ImageSlider.php
@@ -44,14 +44,14 @@ class ImageSlider
     /**
      * @var \DateTime
      *
-     * @ORM\Column(name="display_from", type="datetime")
+     * @ORM\Column(name="display_from", type="datetime", nullable=true)
      */
     private $display_from;
 
     /**
      * @var \DateTime
      *
-     * @ORM\Column(name="display_to", type="datetime")
+     * @ORM\Column(name="display_to", type="datetime", nullable=true)
      */
     private $display_to;
 

diff --git a/src/Form/ImageSliderType.php b/src/Form/ImageSliderType.php
@@ -134,13 +134,15 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 'widget' => 'single_text',
                 'html5' => true,
                 'input' => 'datetime',
+                'with_seconds' => true,
             ])
             ->add('display_to', DateTimeType::class, [
                 'label' => $this->trans('Display to', TranslationDomains::TRANSLATION_DOMAIN_ADMIN),
                 'required' => true,
                 'widget' => 'single_text',
                 'html5' => true,
                 'input' => 'datetime',
+                'with_seconds' => true,
             ]);
 
         if ($this->isMultistoreUsed) {