瀏覽代碼

Merge branch 'develop' of https://forge.laclic.fr/Laclic/CaracoleSkeleton into develop

develop
Fab 3 年之前
父節點
當前提交
ac414f340a
共有 32 個檔案被更改,包括 303 行新增136 行删除
  1. +32
    -0
      config/dependencies.php
  2. +2
    -2
      config/packages/lc_sov.yaml
  3. +1
    -13
      config/routes.yaml
  4. +48
    -11
      config/services.yaml
  5. +9
    -12
      src/Command/TestCommand.php
  6. +5
    -0
      src/Controller/Config/TaxRateAdminController.php
  7. +5
    -1
      src/Controller/Config/UnitAdminController.php
  8. +6
    -1
      src/Controller/Credit/CreditHistoryAdminController.php
  9. +5
    -2
      src/Controller/Dashboard/DashboardAdminController.php
  10. +39
    -27
      src/Controller/IndexController.php
  11. +6
    -0
      src/Controller/Merchant/MerchantAdminController.php
  12. +6
    -0
      src/Controller/Newsletter/NewsletterAdminController.php
  13. +5
    -0
      src/Controller/PointSale/PointSaleAdminController.php
  14. +5
    -0
      src/Controller/Section/SectionAdminController.php
  15. +6
    -0
      src/Controller/Site/NewsAdminController.php
  16. +6
    -0
      src/Controller/Site/PageAdminController.php
  17. +5
    -0
      src/Controller/Ticket/TicketAdminController.php
  18. +10
    -4
      src/Controller/User/GroupUserAdminController.php
  19. +5
    -3
      src/Controller/User/UserMerchantAdminController.php
  20. +24
    -0
      src/Dependency/Definition/DefinitionDependency.php
  21. +19
    -0
      src/Dependency/Reminder/ReminderDependency.php
  22. +18
    -0
      src/Dependency/Ticket/TicketDependency.php
  23. +16
    -0
      src/Dependency/Ticket/TicketMessageDependency.php
  24. +0
    -26
      src/Entity/Credit/CreditConfig.php
  25. +0
    -1
      src/Entity/File/File.php
  26. +0
    -26
      src/Entity/PointSale/PointSaleDayInfo.php
  27. +12
    -1
      src/Entity/Reminder/Reminder.php
  28. +1
    -0
      src/Kernel.php
  29. +1
    -1
      templates/admin/dashboard/dashboard.html.twig
  30. +1
    -1
      templates/block/nav.html.twig
  31. +1
    -1
      templates/page/page.html.twig
  32. +4
    -3
      webpack.config.js

+ 32
- 0
config/dependencies.php 查看文件

<?php

namespace Symfony\Component\DependencyInjection\Loader\Configurator;

return function(ContainerConfigurator $configurator) {

$services = $configurator->services();

$baseDirectoryDependency = dirname(__FILE__).'/../src/Dependency/';
$directoriesDenpendencyInjection = scandir($baseDirectoryDependency);
$dependencies = [];
foreach($directoriesDenpendencyInjection as $directory) {
if($directory != '.' && $directory != '..' && is_dir($baseDirectoryDependency.$directory)) {
$filesDenpendencyInjection = scandir($baseDirectoryDependency.$directory);
foreach($filesDenpendencyInjection as $file) {
if($file != '.' && $file != '..') {
$classDependency = 'App\Dependency\\'.$directory.'\\'.str_replace('.php', '', $file) ;
$dependencies[] = new $classDependency;
}
}
}
}

foreach($dependencies as $dependency) {
$aliases = $dependency->getAliases();

foreach($aliases as $alias => $final) {
$services->alias($alias, $final);
}
}

};

+ 2
- 2
config/packages/lc_sov.yaml 查看文件

login_redirection: login_redirection:
redirect_referer: true redirect_referer: true
roles_redirection: roles_redirection:
- { role: "ROLE_ADMIN", redirect: "admin_dashboard" }
- { role: "ROLE_SUPER_ADMIN", redirect: "admin_dashboard" }
- { role: "ROLE_ADMIN", redirect: "app_admin_dashboard" }
- { role: "ROLE_SUPER_ADMIN", redirect: "app_admin_dashboard" }

+ 1
- 13
config/routes.yaml 查看文件

artgris_bundle_file_manager: artgris_bundle_file_manager:
resource: "@ArtgrisFileManagerBundle/Controller" resource: "@ArtgrisFileManagerBundle/Controller"
type: annotation type: annotation
prefix: /manager

admin_dashboard:
path: /admin
controller: App\Controller\Dashboard\DashboardAdminController::index

app_homepage:
path: /
defaults: { _controller: App\Controller\IndexController::index , _locale: fr}

app_page:
path: /page/{pageSlug}
controller: App\Controller\IndexController::page
prefix: /manager

+ 48
- 11
config/services.yaml 查看文件

app.locales: ["fr"] app.locales: ["fr"]
app.default_locale: "fr" app.default_locale: "fr"
app.path_uploads: '/uploads' app.path_uploads: '/uploads'
app.reminder.route_render_modal: 'carac_admin_reminder_render_modal'
app.reminder.route_new: 'carac_admin_reminder_new'
app.reminder.route_render_modal: 'sov_admin_reminder_render_modal'
app.reminder.route_new: 'sov_admin_reminder_new'
app.reminder.route_edit: 'sov_admin_reminder_edit'


services: services:
# default configuration for services in *this* file # default configuration for services in *this* file
# add more service definitions when explicit configuration is needed # add more service definitions when explicit configuration is needed
# please note that last definitions always *replace* previous ones # please note that last definitions always *replace* previous ones


Lc\CaracoleBundle\Definition\MerchantSettingDefinition:
class: App\Definition\MerchantSettingDefinition
# Definition
#Lc\CaracoleBundle\Definition\MerchantSettingDefinition:
# class: App\Definition\MerchantSettingDefinition
#Lc\SovBundle\Definition\SiteSettingDefinition:
# class: App\Definition\SiteSettingDefinition


Lc\SovBundle\Definition\SiteSettingDefinition:
class: App\Definition\SiteSettingDefinition
# Repository
#Lc\SovBundle\Repository\Reminder\ReminderRepositoryInterface:
# class: Lc\SovBundle\Repository\Reminder\ReminderRepository
#Lc\SovBundle\Repository\File\FileRepositoryInterface:
# class: Lc\SovBundle\Repository\File\FileRepository
#Lc\SovBundle\Repository\Newsletter\NewsletterRepositoryInterface:
# class: Lc\SovBundle\Repository\Newsletter\NewsletterRepository
#Lc\SovBundle\Repository\Setting\SiteSettingRepositoryInterface:
# class: Lc\SovBundle\Repository\Setting\SiteSettingRepository
#Lc\SovBundle\Repository\Site\SiteRepositoryInterface:
# class: Lc\SovBundle\Repository\Site\SiteRepository
#Lc\SovBundle\Repository\Site\PageRepositoryInterface:
# class: Lc\SovBundle\Repository\Site\PageRepository
#Lc\SovBundle\Repository\Site\NewsRepositoryInterface:
# class: Lc\SovBundle\Repository\Site\NewsRepository
#Lc\SovBundle\Repository\Ticket\TicketRepositoryInterface:
# class: Lc\SovBundle\Repository\Ticket\TicketRepository
#Lc\SovBundle\Repository\Ticket\TicketMessageRepositoryInterface:
# class: Lc\SovBundle\Repository\Ticket\TicketMessageRepository
#Lc\SovBundle\Repository\User\GroupUserRepositoryInterface:
# class: Lc\CaracoleBundle\Repository\User\GroupUserRepository
#Lc\SovBundle\Repository\User\UserRepositoryInterface:
# class: Lc\SovBundle\Repository\User\UserRepository
#Lc\CaracoleBundle\Repository\Merchant\MerchantRepositoryInterface:
# class: Lc\CaracoleBundle\Repository\Merchant\MerchantRepository
#Lc\CaracoleBundle\Repository\User\UserMerchantRepositoryInterface:
# class: Lc\CaracoleBundle\Repository\User\UserMerchantRepository
#Lc\CaracoleBundle\Repository\User\VisitorRepositoryInterface:
# class: Lc\CaracoleBundle\Repository\User\VisitorRepository
#Lc\CaracoleBundle\Repository\Section\SectionRepositoryInterface:
# class: Lc\CaracoleBundle\Repository\Section\SectionRepository
#Lc\CaracoleBundle\Repository\PointSale\PointSaleRepositoryInterface:
# class: Lc\CaracoleBundle\Repository\PointSale\PointSaleRepository
#Lc\CaracoleBundle\Repository\Credit\CreditHistoryRepositoryInterface:
# class: Lc\CaracoleBundle\Repository\Credit\CreditHistoryRepository


Lc\SovBundle\Factory\Reminder\ReminderFactoryInterface:
class: Lc\CaracoleBundle\Factory\Reminder\ReminderFactory

Lc\SovBundle\Factory\Ticket\TicketFactoryInterface:
class: Lc\CaracoleBundle\Factory\Ticket\TicketFactory
# Factory
#Lc\SovBundle\Factory\Reminder\ReminderFactoryInterface:
# class: Lc\CaracoleBundle\Factory\Reminder\ReminderFactory
#Lc\SovBundle\Factory\Ticket\TicketFactoryInterface:
# class: Lc\CaracoleBundle\Factory\Ticket\TicketFactory

+ 9
- 12
src/Command/TestCommand.php 查看文件



namespace App\Command; namespace App\Command;


use Lc\SovBundle\Repository\Reminder\ReminderRepositoryQueryInterface;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use Lc\CaracoleBundle\Repository\Reminder\ReminderRepositoryQuery;
use Lc\SovBundle\Repository\Reminder\ReminderStore;
use Lc\SovBundle\Repository\Reminder\ReminderStoreInterface;


class TestCommand extends Command class TestCommand extends Command
{ {
protected static $defaultName = 'app:test'; protected static $defaultName = 'app:test';
protected static $defaultDescription = 'Add a short description for your command'; protected static $defaultDescription = 'Add a short description for your command';
protected ReminderRepositoryQuery $query;
protected ReminderStore $store;
protected ReminderRepositoryQueryInterface $query;
protected ReminderStoreInterface $store;


public function __construct( public function __construct(
ReminderRepositoryQuery $query,
ReminderStore $store
)
{
ReminderRepositoryQueryInterface $query,
ReminderStoreInterface $store
) {
$this->query = $query; $this->query = $query;
$this->store = $store; $this->store = $store;


protected function configure(): void protected function configure(): void
{ {
$this $this
->addArgument('arg1', InputArgument::OPTIONAL, 'Argument description')
->addOption('option1', null, InputOption::VALUE_NONE, 'Option description')
;
->addArgument('arg1', InputArgument::OPTIONAL, 'Argument description')
->addOption('option1', null, InputOption::VALUE_NONE, 'Option description');
} }


protected function execute(InputInterface $input, OutputInterface $output): int protected function execute(InputInterface $input, OutputInterface $output): int

+ 5
- 0
src/Controller/Config/TaxRateAdminController.php 查看文件



use App\Entity\Config\TaxRate; use App\Entity\Config\TaxRate;
use Lc\CaracoleBundle\Controller\Config\TaxRateAdminController as CaracTaxRateAdminController; use Lc\CaracoleBundle\Controller\Config\TaxRateAdminController as CaracTaxRateAdminController;
use Lc\CaracoleBundle\Factory\Config\TaxRateFactory;


class TaxRateAdminController extends CaracTaxRateAdminController class TaxRateAdminController extends CaracTaxRateAdminController
{ {
return TaxRate::class; return TaxRate::class;
} }


public function getEntityFactory(): string
{
return TaxRateFactory::class;
}
} }

+ 5
- 1
src/Controller/Config/UnitAdminController.php 查看文件



use App\Entity\Config\Unit; use App\Entity\Config\Unit;
use Lc\CaracoleBundle\Controller\Config\UnitAdminController as CaracUnitAdminController; use Lc\CaracoleBundle\Controller\Config\UnitAdminController as CaracUnitAdminController;
use Lc\CaracoleBundle\Factory\Config\UnitFactory;


class UnitAdminController extends CaracUnitAdminController class UnitAdminController extends CaracUnitAdminController
{ {

public static function getEntityFqcn(): string public static function getEntityFqcn(): string
{ {
return Unit::class; return Unit::class;
} }


public function getEntityFactory(): string
{
return UnitFactory::class;
}
} }

+ 6
- 1
src/Controller/Credit/CreditHistoryAdminController.php 查看文件

namespace App\Controller\Credit; namespace App\Controller\Credit;


use App\Entity\Credit\CreditHistory; use App\Entity\Credit\CreditHistory;
use App\Entity\Newsletter\Newsletter;
use Lc\CaracoleBundle\Controller\Credit\CreditHistoryAdminController as CaracCreditHistoryAdminController; use Lc\CaracoleBundle\Controller\Credit\CreditHistoryAdminController as CaracCreditHistoryAdminController;
use Lc\CaracoleBundle\Factory\Credit\CreditHistoryFactory;


class CreditHistoryAdminController extends CaracCreditHistoryAdminController class CreditHistoryAdminController extends CaracCreditHistoryAdminController
{ {
{ {
return CreditHistory::class; return CreditHistory::class;
} }

public function getEntityFactory(): string
{
return CreditHistoryFactory::class;
}
} }

+ 5
- 2
src/Controller/Dashboard/DashboardAdminController.php 查看文件

use App\Entity\Site\Page; use App\Entity\Site\Page;
use App\Entity\Ticket\Ticket; use App\Entity\Ticket\Ticket;
use App\Entity\User\GroupUser; use App\Entity\User\GroupUser;
use App\Entity\User\User;
use App\Entity\User\UserMerchant; use App\Entity\User\UserMerchant;
use EasyCorp\Bundle\EasyAdminBundle\Config\MenuItem; use EasyCorp\Bundle\EasyAdminBundle\Config\MenuItem;
use Lc\CaracoleBundle\Controller\Dashboard\DashboardAdminAdminController as CaracDashboardController; use Lc\CaracoleBundle\Controller\Dashboard\DashboardAdminAdminController as CaracDashboardController;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;


class DashboardAdminController extends CaracDashboardController class DashboardAdminController extends CaracDashboardController
{ {
[ [
MenuItem::linkToRoute('setting_merchant', '', 'carac_admin_setting_merchant'), MenuItem::linkToRoute('setting_merchant', '', 'carac_admin_setting_merchant'),
MenuItem::linkToRoute('setting_section', '', 'carac_admin_setting_section'), MenuItem::linkToRoute('setting_section', '', 'carac_admin_setting_section'),
MenuItem::linkToRoute('setting_global', '', 'carac_admin_setting_global'),
MenuItem::linkToRoute('setting_global', '', 'carac_admin_setting_site'),
] ]
); );


); );
} }


/**
* @Route("/admin", name="app_admin_dashboard")
*/
public function index(): Response public function index(): Response
{ {
return $this->render('admin/dashboard/dashboard.html.twig'); return $this->render('admin/dashboard/dashboard.html.twig');

+ 39
- 27
src/Controller/IndexController.php 查看文件

use Lc\SovBundle\Doctrine\EntityManager; use Lc\SovBundle\Doctrine\EntityManager;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;


class IndexController extends AbstractController class IndexController extends AbstractController
{ {
protected $em;
protected $mailer;

public function __construct(EntityManager $em)
{
$this->em = $em;
}

public function index(): Response
{
$pageRepository = $this->em->getRepository(Page::class);
$pages = $pageRepository->findAll();

return $this->render('page/index.html.twig', [
protected $em;
protected $mailer;

public function __construct(EntityManager $em)
{
$this->em = $em;
}

/**
* @Route("/", name="app_homepage")
*/
public function index(): Response
{
$pageRepository = $this->em->getRepository(Page::class);
$pages = $pageRepository->findAll();

return $this->render(
'page/index.html.twig',
[
'controller_name' => 'IndexController', 'controller_name' => 'IndexController',
'pages' => $pages 'pages' => $pages
]);
}

public function page($pageSlug): Response
{
$pageRepository = $this->em->getRepository(Page::class);
$page = $pageRepository->findOneBySlug($pageSlug);


return $this->render('page/page.html.twig', [
]
);
}

/**
* @Route("/page/{pageSlug}", name="app_page")
*/
public function page($pageSlug): Response
{
$pageRepository = $this->em->getRepository(Page::class);
$page = $pageRepository->findOneBySlug($pageSlug);


return $this->render(
'page/page.html.twig',
[
'controller_name' => 'IndexController', 'controller_name' => 'IndexController',
'page' => $page 'page' => $page
]);
}
]
);
}
} }

+ 6
- 0
src/Controller/Merchant/MerchantAdminController.php 查看文件



use App\Entity\Merchant\Merchant; use App\Entity\Merchant\Merchant;
use Lc\CaracoleBundle\Controller\Merchant\MerchantAdminController as CaracMerchantAdminController; use Lc\CaracoleBundle\Controller\Merchant\MerchantAdminController as CaracMerchantAdminController;
use Lc\CaracoleBundle\Factory\Merchant\MerchantFactory;


class MerchantAdminController extends CaracMerchantAdminController class MerchantAdminController extends CaracMerchantAdminController
{ {
{ {
return Merchant::class; return Merchant::class;
} }

public function getEntityFactory(): string
{
return MerchantFactory::class;
}
} }

+ 6
- 0
src/Controller/Newsletter/NewsletterAdminController.php 查看文件



use App\Entity\Newsletter\Newsletter; use App\Entity\Newsletter\Newsletter;
use Lc\CaracoleBundle\Controller\Newsletter\NewsletterAdminController as CaracNewsletterAdminController; use Lc\CaracoleBundle\Controller\Newsletter\NewsletterAdminController as CaracNewsletterAdminController;
use Lc\CaracoleBundle\Factory\Newsletter\NewsletterFactory;


class NewsletterAdminController extends CaracNewsletterAdminController class NewsletterAdminController extends CaracNewsletterAdminController
{ {
{ {
return Newsletter::class; return Newsletter::class;
} }

public function getEntityFactory(): string
{
return NewsletterFactory::class;
}
} }

+ 5
- 0
src/Controller/PointSale/PointSaleAdminController.php 查看文件



use App\Entity\PointSale\PointSale; use App\Entity\PointSale\PointSale;
use Lc\CaracoleBundle\Controller\PointSale\PointSaleAdminController as CaracPointSaleAdminController; use Lc\CaracoleBundle\Controller\PointSale\PointSaleAdminController as CaracPointSaleAdminController;
use Lc\CaracoleBundle\Factory\PointSale\PointSaleFactory;


class PointSaleAdminController extends CaracPointSaleAdminController class PointSaleAdminController extends CaracPointSaleAdminController
{ {
return PointSale::class; return PointSale::class;
} }


public function getEntityFactory(): string
{
return PointSaleFactory::class;
}
} }

+ 5
- 0
src/Controller/Section/SectionAdminController.php 查看文件



use App\Entity\Section\Section; use App\Entity\Section\Section;
use Lc\CaracoleBundle\Controller\Section\SectionAdminController as CaracSectionAdminController; use Lc\CaracoleBundle\Controller\Section\SectionAdminController as CaracSectionAdminController;
use Lc\CaracoleBundle\Factory\Section\SectionFactory;


class SectionAdminController extends CaracSectionAdminController class SectionAdminController extends CaracSectionAdminController
{ {
return Section::class; return Section::class;
} }


public function getEntityFactory(): string
{
return SectionFactory::class;
}
} }

+ 6
- 0
src/Controller/Site/NewsAdminController.php 查看文件



use App\Entity\Site\News; use App\Entity\Site\News;
use Lc\CaracoleBundle\Controller\Site\NewsAdminController as CaracNewsAdminController; use Lc\CaracoleBundle\Controller\Site\NewsAdminController as CaracNewsAdminController;
use Lc\CaracoleBundle\Factory\Site\NewsFactory;


class NewsAdminController extends CaracNewsAdminController class NewsAdminController extends CaracNewsAdminController
{ {
{ {
return News::class; return News::class;
} }

public function getEntityFactory(): string
{
return NewsFactory::class;
}
} }

+ 6
- 0
src/Controller/Site/PageAdminController.php 查看文件



use App\Entity\Site\Page; use App\Entity\Site\Page;
use Lc\CaracoleBundle\Controller\Site\PageAdminController as CaracPageAdminController; use Lc\CaracoleBundle\Controller\Site\PageAdminController as CaracPageAdminController;
use Lc\CaracoleBundle\Factory\Site\PageFactory;


class PageAdminController extends CaracPageAdminController class PageAdminController extends CaracPageAdminController
{ {
{ {
return Page::class; return Page::class;
} }

public function getEntityFactory(): string
{
return PageFactory::class;
}
} }

+ 5
- 0
src/Controller/Ticket/TicketAdminController.php 查看文件



use App\Entity\Ticket\Ticket; use App\Entity\Ticket\Ticket;
use Lc\CaracoleBundle\Controller\Ticket\TicketAdminController as CaracTicketAdminController; use Lc\CaracoleBundle\Controller\Ticket\TicketAdminController as CaracTicketAdminController;
use Lc\CaracoleBundle\Factory\Ticket\TicketFactory;


class TicketAdminController extends CaracTicketAdminController class TicketAdminController extends CaracTicketAdminController
{ {
return Ticket::class; return Ticket::class;
} }


public function getEntityFactory(): string
{
return TicketFactory::class;
}
} }

+ 10
- 4
src/Controller/User/GroupUserAdminController.php 查看文件



use App\Entity\User\GroupUser; use App\Entity\User\GroupUser;
use Lc\CaracoleBundle\Controller\User\GroupUserAdminController as CaracAbstractUserAdminController; use Lc\CaracoleBundle\Controller\User\GroupUserAdminController as CaracAbstractUserAdminController;
use Lc\CaracoleBundle\Factory\User\GroupUserFactory;


class GroupUserAdminController extends CaracAbstractUserAdminController class GroupUserAdminController extends CaracAbstractUserAdminController
{ {
public static function getEntityFqcn(): string
{
return GroupUser::class;
}
public static function getEntityFqcn(): string
{
return GroupUser::class;
}

public function getEntityFactory(): string
{
return GroupUserFactory::class;
}
} }

+ 5
- 3
src/Controller/User/UserMerchantAdminController.php 查看文件



use App\Entity\User\UserMerchant; use App\Entity\User\UserMerchant;
use Lc\CaracoleBundle\Controller\User\UserMerchantAdminController as CaracUserMerchantAdminController; use Lc\CaracoleBundle\Controller\User\UserMerchantAdminController as CaracUserMerchantAdminController;
use Lc\CaracoleBundle\Factory\User\UserMerchantFactory;


class UserMerchantAdminController extends CaracUserMerchantAdminController class UserMerchantAdminController extends CaracUserMerchantAdminController
{ {
return UserMerchant::class; return UserMerchant::class;
} }




public function getEntityFactory(): string
{
return UserMerchantFactory::class;
}
} }

+ 24
- 0
src/Dependency/Definition/DefinitionDependency.php 查看文件

<?php

namespace App\Dependency\Definition;

use App\Definition\MerchantSettingDefinition;
use App\Definition\SectionSettingDefinition;
use App\Definition\SiteSettingDefinition;
use Lc\CaracoleBundle\Definition\MerchantSettingDefinitionInterface;
use Lc\CaracoleBundle\Definition\SectionSettingDefinitionInterface;
use Lc\SovBundle\Definition\SiteSettingDefinitionInterface;
//use Lc\SovBundle\Definition\SiteSettingDefinition as SovSiteSettingDefinition;

class DefinitionDependency
{
public function getAliases()
{
return [
MerchantSettingDefinitionInterface::class => MerchantSettingDefinition::class,
SectionSettingDefinitionInterface::class => SectionSettingDefinition::class,
SiteSettingDefinitionInterface::class => SiteSettingDefinition::class,
];
}

}

+ 19
- 0
src/Dependency/Reminder/ReminderDependency.php 查看文件

<?php

namespace App\Dependency\Reminder;

use Lc\CaracoleBundle\Factory\Reminder\ReminderFactory;
use Lc\CaracoleBundle\Repository\Reminder\ReminderRepositoryQuery;
use Lc\SovBundle\Factory\Reminder\ReminderFactoryInterface;
use Lc\SovBundle\Repository\Reminder\ReminderRepositoryQueryInterface;

class ReminderDependency
{
public function getAliases()
{
return [
ReminderRepositoryQueryInterface::class => ReminderRepositoryQuery::class,
ReminderFactoryInterface::class => ReminderFactory::class,
];
}
}

+ 18
- 0
src/Dependency/Ticket/TicketDependency.php 查看文件

<?php

namespace App\Dependency\Ticket;


use Lc\CaracoleBundle\Factory\Ticket\TicketFactory;
use Lc\SovBundle\Factory\Ticket\TicketFactoryInterface;

class TicketDependency
{
public function getAliases()
{
return [
TicketFactoryInterface::class => TicketFactory::class,
];
}

}

+ 16
- 0
src/Dependency/Ticket/TicketMessageDependency.php 查看文件

<?php

namespace App\Dependency\Ticket;

use Lc\SovBundle\Factory\Ticket\TicketMessageFactory;
use Lc\SovBundle\Factory\Ticket\TicketMessageFactoryInterface;

class TicketMessageDependency
{
public function getAliases()
{
return [
//TicketMessageFactoryInterface::class => TicketMessageFactory::class,
];
}
}

+ 0
- 26
src/Entity/Credit/CreditConfig.php 查看文件

<?php

namespace App\Entity\Credit;

use Lc\CaracoleBundle\Repository\Credit\CreditConfigRepository;
use Doctrine\ORM\Mapping as ORM;
use Lc\CaracoleBundle\Model\Credit\CreditConfigInterface;
use Lc\CaracoleBundle\Model\Credit\CreditConfigModel;

/**
* @ORM\Entity(repositoryClass=CreditConfigRepository::class)
*/
class CreditConfig extends CreditConfigModel implements CreditConfigInterface
{
/**
* @ORM\Id
* @ORM\GeneratedValue
* @ORM\Column(type="integer")
*/
private $id;

public function getId(): ?int
{
return $this->id;
}
}

+ 0
- 1
src/Entity/File/File.php 查看文件

use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Lc\SovBundle\Model\File\FileInterface; use Lc\SovBundle\Model\File\FileInterface;
use Lc\SovBundle\Model\File\FileModel; use Lc\SovBundle\Model\File\FileModel;
use Lc\SovBundle\Repository\File\FileRepository;


/** /**
* @ORM\Entity(repositoryClass=FileRepository::class) * @ORM\Entity(repositoryClass=FileRepository::class)

+ 0
- 26
src/Entity/PointSale/PointSaleDayInfo.php 查看文件

<?php

namespace App\Entity\PointSale;

use Lc\CaracoleBundle\Repository\PointSale\PointSaleDayInfoRepository;
use Doctrine\ORM\Mapping as ORM;
use Lc\CaracoleBundle\Model\PointSale\PointSaleDayInfoInterface;
use Lc\CaracoleBundle\Model\PointSale\PointSaleDayInfoModel;

/**
* @ORM\Entity(repositoryClass=PointSaleDayInfoRepository::class)
*/
class PointSaleDayInfo extends PointSaleDayInfoModel implements PointSaleDayInfoInterface
{
/**
* @ORM\Id
* @ORM\GeneratedValue
* @ORM\Column(type="integer")
*/
private $id;

public function getId(): ?int
{
return $this->id;
}
}

+ 12
- 1
src/Entity/Reminder/Reminder.php 查看文件



namespace App\Entity\Reminder; namespace App\Entity\Reminder;


use Lc\SovBundle\Repository\Reminder\ReminderRepository;
use Lc\CaracoleBundle\Factory\Reminder\ReminderFactory;
use Lc\SovBundle\Factory\Reminder\ReminderFactoryInterface;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Lc\CaracoleBundle\Model\Reminder\ReminderModel; use Lc\CaracoleBundle\Model\Reminder\ReminderModel;
use Lc\SovBundle\Repository\Reminder\ReminderRepositoryInterface;
use App\Repository\Reminder\ReminderRepository;


/** /**
* @ORM\Entity(repositoryClass=ReminderRepository::class) * @ORM\Entity(repositoryClass=ReminderRepository::class)
*/ */
private $id; private $id;


public function getAliases()
{
return [
ReminderFactoryInterface::class => ReminderFactory::class,
ReminderRepositoryInterface::class => ReminderRepository::class,
];
}

public function getId(): ?int public function getId(): ?int
{ {
return $this->id; return $this->id;

+ 1
- 0
src/Kernel.php 查看文件



if (is_file(\dirname(__DIR__).'/config/services.yaml')) { if (is_file(\dirname(__DIR__).'/config/services.yaml')) {
$container->import('../config/services.yaml'); $container->import('../config/services.yaml');
$container->import('../config/dependencies.php');
$container->import('../config/{services}_'.$this->environment.'.yaml'); $container->import('../config/{services}_'.$this->environment.'.yaml');
} elseif (is_file($path = \dirname(__DIR__).'/config/services.php')) { } elseif (is_file($path = \dirname(__DIR__).'/config/services.php')) {
(require $path)($container->withPath($path), $this); (require $path)($container->withPath($path), $this);

+ 1
- 1
templates/admin/dashboard/dashboard.html.twig 查看文件

{% extends '@LcCaracole/adminlte/layout.html.twig' %} {% extends '@LcCaracole/adminlte/layout.html.twig' %}


{% block content_title %} {% block content_title %}
{{ 'dashboard'|lc_trans_admin_title }}
{{ 'dashboard'|sov_trans_admin_title }}
{% endblock %} {% endblock %}


{% block main %} {% block main %}

+ 1
- 1
templates/block/nav.html.twig 查看文件

{% endfor %} {% endfor %}
</ul> </ul>


{% for lg, url in translated_urls() %}
{% for lg, url in sov_translated_urls() %}
<a class="{{ app.request.locale == lg ? 'selected' : '' }}" title="{{ "misc.switch"|trans({"%lang%": lg}) }}" href="{{ url }}">{{ lg }}</a> <a class="{{ app.request.locale == lg ? 'selected' : '' }}" title="{{ "misc.switch"|trans({"%lang%": lg}) }}" href="{{ url }}">{{ lg }}</a>
{% if lg == 'fr' %} {% if lg == 'fr' %}
<span class="slash">/</span> <span class="slash">/</span>

+ 1
- 1
templates/page/page.html.twig 查看文件



{% block content %} {% block content %}
{{ page.description|raw }} {{ page.description|raw }}
<img src="{{ lc_liip(page.image.path, 'page') }}" alt="{{ page.image.legend }}" />
<img src="{{ sov_liip(page.image.path, 'page') }}" alt="{{ page.image.legend }}" />
{% endblock %} {% endblock %}

+ 4
- 3
webpack.config.js 查看文件

.addEntry('adminlte-sort', './Lc/SovBundle/Resources/assets/app/adminlte/sort/app.sort.js') .addEntry('adminlte-sort', './Lc/SovBundle/Resources/assets/app/adminlte/sort/app.sort.js')
.addEntry('adminlte-field-filemanager', './Lc/SovBundle/Resources/assets/app/adminlte/field/filemanager/app.filemanager.js') .addEntry('adminlte-field-filemanager', './Lc/SovBundle/Resources/assets/app/adminlte/field/filemanager/app.filemanager.js')
.addEntry('adminlte-field-collection', './Lc/SovBundle/Resources/assets/app/adminlte/field/collection/app.collection.js') .addEntry('adminlte-field-collection', './Lc/SovBundle/Resources/assets/app/adminlte/field/collection/app.collection.js')
.addEntry('adminlte-ticket', './Lc/SovBundle/Resources/assets/app/adminlte/ticket/app.ticket.js')
.addEntry('adminlte-reminder', './Lc/SovBundle/Resources/assets/app/adminlte/reminder/app.reminder.js')
.addEntry('carac-switch-merchant', './Lc/CaracoleBundle/Resources/assets/app/switchmerchant/app.switchmerchant.js')
.addEntry('sov-reminder', './Lc/SovBundle/Resources/assets/app/admin/reminder/app.reminder.js')
.addEntry('sov-ticket', './Lc/SovBundle/Resources/assets/app/admin/ticket/app.ticket.js')
.addEntry('carac-common', './Lc/CaracoleBundle/Resources/assets/app/adminlte/common/app.common.js') .addEntry('carac-common', './Lc/CaracoleBundle/Resources/assets/app/adminlte/common/app.common.js')
.addEntry('carac-switch-merchant', './Lc/CaracoleBundle/Resources/assets/app/admin/switchmerchant/app.switchmerchant.js')



// enables the Symfony UX Stimulus bridge (used in assets/bootstrap.js) // enables the Symfony UX Stimulus bridge (used in assets/bootstrap.js)
.enableStimulusBridge('./assets/controllers.json') .enableStimulusBridge('./assets/controllers.json')

Loading…
取消
儲存