@@ -13,8 +13,8 @@ |
||
| 13 | 13 | |
| 14 | 14 | use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType; |
| 15 | 15 | use Symfony\Component\Form\Extension\Core\Type\ChoiceType; |
| 16 | -use Symfony\Component\Form\Extension\Core\Type\TextareaType; |
|
| 17 | 16 | use Symfony\Component\Form\Extension\Core\Type\TextType; |
| 17 | +use Symfony\Component\Form\Extension\Core\Type\TextareaType; |
|
| 18 | 18 | use Symfony\Component\Form\FormBuilderInterface; |
| 19 | 19 | use Symfony\Component\OptionsResolver\OptionsResolver; |
| 20 | 20 | use Symfony\Component\Validator\Constraints\Valid; |
@@ -12,9 +12,6 @@ |
||
| 12 | 12 | namespace Sylius\Bundle\TaxonomyBundle\DependencyInjection; |
| 13 | 13 | |
| 14 | 14 | use Sylius\Bundle\ResourceBundle\Controller\ResourceController; |
| 15 | -use Sylius\Bundle\ResourceBundle\Form\Type\ResourceFromIdentifierType; |
|
| 16 | -use Sylius\Bundle\ResourceBundle\Form\Type\ResourceToHiddenIdentifierType; |
|
| 17 | -use Sylius\Bundle\ResourceBundle\Form\Type\ResourceToIdentifierType; |
|
| 18 | 15 | use Sylius\Bundle\ResourceBundle\SyliusResourceBundle; |
| 19 | 16 | use Sylius\Bundle\TaxonomyBundle\Form\Type\TaxonTranslationType; |
| 20 | 17 | use Sylius\Bundle\TaxonomyBundle\Form\Type\TaxonType; |
@@ -13,7 +13,6 @@ |
||
| 13 | 13 | |
| 14 | 14 | use Sylius\Bundle\ResourceBundle\SyliusResourceBundle; |
| 15 | 15 | use Sylius\Bundle\UserBundle\Controller\UserController; |
| 16 | -use Sylius\Bundle\UserBundle\Form\Type\UserType; |
|
| 17 | 16 | use Sylius\Component\Resource\Factory\Factory; |
| 18 | 17 | use Sylius\Component\User\Model\User; |
| 19 | 18 | use Sylius\Component\User\Model\UserInterface; |
@@ -12,7 +12,6 @@ |
||
| 12 | 12 | namespace Sylius\Bundle\UserBundle\Form\Type; |
| 13 | 13 | |
| 14 | 14 | use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType; |
| 15 | -use Sylius\Component\Resource\Metadata\MetadataInterface; |
|
| 16 | 15 | use Symfony\Component\Form\Extension\Core\Type\CheckboxType; |
| 17 | 16 | use Symfony\Component\Form\Extension\Core\Type\EmailType; |
| 18 | 17 | use Symfony\Component\Form\Extension\Core\Type\PasswordType; |
@@ -17,7 +17,6 @@ |
||
| 17 | 17 | use Sylius\Component\Resource\Metadata\MetadataInterface; |
| 18 | 18 | use Symfony\Component\DependencyInjection\ContainerBuilder; |
| 19 | 19 | use Symfony\Component\DependencyInjection\Definition; |
| 20 | -use Symfony\Component\DependencyInjection\Parameter; |
|
| 21 | 20 | use Symfony\Component\DependencyInjection\Reference; |
| 22 | 21 | |
| 23 | 22 | /** |
@@ -45,11 +45,11 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | private function specifyAddress(AddressInterface $address, $addressType) |
| 47 | 47 | { |
| 48 | - $this->specifyElementValue($addressType.'_first_name', $address->getFirstName()); |
|
| 49 | - $this->specifyElementValue($addressType.'_last_name', $address->getLastName()); |
|
| 50 | - $this->specifyElementValue($addressType.'_street', $address->getStreet()); |
|
| 51 | - $this->specifyElementValue($addressType.'_city', $address->getCity()); |
|
| 52 | - $this->specifyElementValue($addressType.'_postcode', $address->getPostcode()); |
|
| 48 | + $this->specifyElementValue($addressType . '_first_name', $address->getFirstName()); |
|
| 49 | + $this->specifyElementValue($addressType . '_last_name', $address->getLastName()); |
|
| 50 | + $this->specifyElementValue($addressType . '_street', $address->getStreet()); |
|
| 51 | + $this->specifyElementValue($addressType . '_city', $address->getCity()); |
|
| 52 | + $this->specifyElementValue($addressType . '_postcode', $address->getPostcode()); |
|
| 53 | 53 | |
| 54 | 54 | $this->chooseCountry($address->getCountryCode(), $addressType); |
| 55 | 55 | } |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | */ |
| 115 | 115 | private function chooseCountry($country, $addressType) |
| 116 | 116 | { |
| 117 | - $this->getElement($addressType.'_country')->selectOption((null !== $country) ? $country : 'Select'); |
|
| 117 | + $this->getElement($addressType . '_country')->selectOption((null !== $country) ? $country : 'Select'); |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | /** |
@@ -103,7 +103,6 @@ |
||
| 103 | 103 | |
| 104 | 104 | /** |
| 105 | 105 | * @param int $price |
| 106 | - * @param string $currencyCode |
|
| 107 | 106 | * |
| 108 | 107 | * @return float |
| 109 | 108 | */ |
@@ -57,33 +57,33 @@ |
||
| 57 | 57 | |
| 58 | 58 | $m = 0; |
| 59 | 59 | foreach ($order->getItems() as $item) { |
| 60 | - $details['L_PAYMENTREQUEST_0_NAME'.$m] = $item->getVariant()->getProduct()->getName(); |
|
| 61 | - $details['L_PAYMENTREQUEST_0_AMT'.$m] = $this->formatPrice($item->getDiscountedUnitPrice()); |
|
| 62 | - $details['L_PAYMENTREQUEST_0_QTY'.$m] = $item->getQuantity(); |
|
| 60 | + $details['L_PAYMENTREQUEST_0_NAME' . $m] = $item->getVariant()->getProduct()->getName(); |
|
| 61 | + $details['L_PAYMENTREQUEST_0_AMT' . $m] = $this->formatPrice($item->getDiscountedUnitPrice()); |
|
| 62 | + $details['L_PAYMENTREQUEST_0_QTY' . $m] = $item->getQuantity(); |
|
| 63 | 63 | |
| 64 | 64 | ++$m; |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | if (0 !== $taxTotal = $order->getAdjustmentsTotalRecursively(AdjustmentInterface::TAX_ADJUSTMENT)) { |
| 68 | - $details['L_PAYMENTREQUEST_0_NAME'.$m] = 'Tax Total'; |
|
| 69 | - $details['L_PAYMENTREQUEST_0_AMT'.$m] = $this->formatPrice($taxTotal); |
|
| 70 | - $details['L_PAYMENTREQUEST_0_QTY'.$m] = 1; |
|
| 68 | + $details['L_PAYMENTREQUEST_0_NAME' . $m] = 'Tax Total'; |
|
| 69 | + $details['L_PAYMENTREQUEST_0_AMT' . $m] = $this->formatPrice($taxTotal); |
|
| 70 | + $details['L_PAYMENTREQUEST_0_QTY' . $m] = 1; |
|
| 71 | 71 | |
| 72 | 72 | ++$m; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | if (0 !== $promotionTotal = $order->getOrderPromotionTotal()) { |
| 76 | - $details['L_PAYMENTREQUEST_0_NAME'.$m] = 'Discount'; |
|
| 77 | - $details['L_PAYMENTREQUEST_0_AMT'.$m] = $this->formatPrice($promotionTotal); |
|
| 78 | - $details['L_PAYMENTREQUEST_0_QTY'.$m] = 1; |
|
| 76 | + $details['L_PAYMENTREQUEST_0_NAME' . $m] = 'Discount'; |
|
| 77 | + $details['L_PAYMENTREQUEST_0_AMT' . $m] = $this->formatPrice($promotionTotal); |
|
| 78 | + $details['L_PAYMENTREQUEST_0_QTY' . $m] = 1; |
|
| 79 | 79 | |
| 80 | 80 | ++$m; |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | if (0 !== $shippingTotal = $order->getShippingTotal()) { |
| 84 | - $details['L_PAYMENTREQUEST_0_NAME'.$m] = 'Shipping Total'; |
|
| 85 | - $details['L_PAYMENTREQUEST_0_AMT'.$m] = $this->formatPrice($shippingTotal); |
|
| 86 | - $details['L_PAYMENTREQUEST_0_QTY'.$m] = 1; |
|
| 84 | + $details['L_PAYMENTREQUEST_0_NAME' . $m] = 'Shipping Total'; |
|
| 85 | + $details['L_PAYMENTREQUEST_0_AMT' . $m] = $this->formatPrice($shippingTotal); |
|
| 86 | + $details['L_PAYMENTREQUEST_0_QTY' . $m] = 1; |
|
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | $request->setResult($details); |
@@ -11,7 +11,6 @@ |
||
| 11 | 11 | |
| 12 | 12 | namespace Sylius\Bundle\CoreBundle\Fixture\Factory; |
| 13 | 13 | |
| 14 | -use Doctrine\Common\Persistence\ObjectManager; |
|
| 15 | 14 | use Sylius\Component\Core\Formatter\StringInflector; |
| 16 | 15 | use Sylius\Component\Core\Model\TaxonInterface; |
| 17 | 16 | use Sylius\Component\Locale\Model\LocaleInterface; |
@@ -94,7 +94,7 @@ |
||
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | /** |
| 97 | - * @return array |
|
| 97 | + * @return \Generator |
|
| 98 | 98 | */ |
| 99 | 99 | private function getLocales() |
| 100 | 100 | { |
@@ -96,7 +96,7 @@ |
||
| 96 | 96 | return $this->faker->email; |
| 97 | 97 | }) |
| 98 | 98 | ->setDefault('username', function (Options $options) { |
| 99 | - return $this->faker->firstName.' '.$this->faker->lastName; |
|
| 99 | + return $this->faker->firstName . ' ' . $this->faker->lastName; |
|
| 100 | 100 | }) |
| 101 | 101 | ->setDefault('enabled', true) |
| 102 | 102 | ->setAllowedTypes('enabled', 'bool') |