Merge branch 'develop'

ShopBundle/Repository/BaseRepository.php

@@ -36,6 +36,19 @@ class BaseRepository extends EntityRepository implements ServiceEntityRepository
                 return $qb->getQuery()->getResult();
 
         }
+
+
+
+        public function findOneByOldUrl($url)
+        {
+                $qb = $this->createQueryBuilder('entity')
+                        ->where('entity.oldUrls LIKE :oldUrl')
+                        ->andWhere('entity.status = 1')
+                        ->setParameter(':oldUrl', '%'.$url.'%');
+
+                return $qb->getQuery()->getOneOrNullResult();
+        }
+
         public function findByMerchantQuery() :QueryBuilder
         {
                 return $this->createQueryBuilder('e')

ShopBundle/Resources/views/backend/default/list-fields/field_datetime.html.twig

@@ -1,4 +1,5 @@
 {#{{ value|date('U')}}#}
+
 {% if field_options.format == "d/m/Y h:i A e" %}
     {% set format = "d/m/Y H:i" %}
 {% else %}