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.

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

New version 2.3.2 (missing version 2.3.1 🙈 ) #46

Merged
merged 10 commits into from
Oct 23, 2023
8 changes: 4 additions & 4 deletions config/admin/services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -188,4 +188,4 @@ services:
class: 'Oksydan\IsImageslider\Provider\ImageProvider'
public: true
arguments:
- '%images_uri%'
- '%is_imageslider_images_uri%'
12 changes: 6 additions & 6 deletions config/common.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion is_imageslider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/Entity/ImageSlider.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 2 additions & 0 deletions src/Form/ImageSliderType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down