Skip to content

Commit

Permalink
Merge pull request #26 from delyriand/fix/js-build
Browse files Browse the repository at this point in the history
Rebuild public JS file with last JS version and fix some errors (PHPCS, mapping)
  • Loading branch information
delyriand authored Mar 19, 2024
2 parents 00ee560 + 3bcafa3 commit bd17904
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ monsieurbiz_sylius_shipping_slot:

sylius_resource:
resources:
monsieurbiz_shipping_slot.shipping_slot_config:
classes:
model: App\Entity\Shipping\ShippingSlotConfig
monsieurbiz_shipping_slot.slot:
classes:
model: App\Entity\Shipping\Slot
9 changes: 4 additions & 5 deletions dist/src/Entity/Shipping/ShippingSlotConfig.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

/*
* This file is part of SyliusShippingSlotPlugin website.
* This file is part of Monsieur Biz' Shipping Slot plugin for Sylius.
*
* (c) SyliusShippingSlotPlugin <sylius+syliusshippingslotplugin@monsieurbiz.com>
* (c) Monsieur Biz <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* For the full copyright and license information, please view the LICENSE.txt
* file that was distributed with this source code.
*/

Expand All @@ -20,7 +20,6 @@
* @ORM\Entity
* @ORM\Table(name="monsieurbiz_shipping_slot_config")
*/
final class ShippingSlotConfig extends BaseShippingSlotConfig
class ShippingSlotConfig extends BaseShippingSlotConfig
{

}
9 changes: 4 additions & 5 deletions dist/src/Entity/Shipping/Slot.php
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

/*
* This file is part of SyliusShippingSlotPlugin website.
* This file is part of Monsieur Biz' Shipping Slot plugin for Sylius.
*
* (c) SyliusShippingSlotPlugin <sylius+syliusshippingslotplugin@monsieurbiz.com>
* (c) Monsieur Biz <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* For the full copyright and license information, please view the LICENSE.txt
* file that was distributed with this source code.
*/

Expand All @@ -20,7 +20,6 @@
* @ORM\Entity
* @ORM\Table(name="monsieurbiz_shipping_slot_slot")
*/
final class Slot extends BaseSlot
class Slot extends BaseSlot
{

}
2 changes: 1 addition & 1 deletion src/Entity/ShipmentTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
trait ShipmentTrait
{
/**
* @ORM\OneToOne(targetEntity="MonsieurBiz\SyliusShippingSlotPlugin\Entity\Slot", mappedBy="shipment", fetch="EAGER")
* @ORM\OneToOne(targetEntity="MonsieurBiz\SyliusShippingSlotPlugin\Entity\SlotInterface", mappedBy="shipment", fetch="EAGER")
*/
private ?SlotInterface $slot = null;

Expand Down
Loading

0 comments on commit bd17904

Please sign in to comment.