Merge pull request #86 from conferencetools/supplementary-tickets

Supplementary tickets
conferencetools · Dec 18, 2017 · 3a16fd6 · 3a16fd6
2 parents 900589f + 7daaf27
commit 3a16fd6
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 23 deletions.
diff --git a/assets/css/card.css b/assets/css/card.css
@@ -40,6 +40,11 @@ body { margin-top:20px; }
     vertical-align: middle;
     width: 50%;
 }
+.credit-card-box .display-td-full {
+    display: table-cell;
+    vertical-align: middle;
+    width: 100%;
+}
 /* Just looks nicer */
 .credit-card-box .panel-heading img {
     min-width: 180px;

diff --git a/src/Controller/TicketController.php b/src/Controller/TicketController.php
@@ -199,7 +199,7 @@ public function purchaseAction()
             return $this->redirect()->toRoute('tickets/complete', ['purchaseId' => $purchaseId]);
         }
 
-        $form = new PurchaseForm($purchase->getTicketCount());
+        $form = new PurchaseForm($purchase);
 
         if ($this->getRequest()->isPost()) {
             $noPayment = true;
@@ -219,8 +219,12 @@ public function purchaseAction()
 
                     $delegateInfo = [];
 
-                    for ($i = 0; $i < $purchase->getTicketCount(); $i++) {
-                        $delegateInfo[] = Delegate::fromArray($data['delegates_' . $i]);
+                    foreach ($purchase->getTickets() as $i => $ticket) {
+                        if (!$ticket->getTicketType()->isSupplementary()) {
+                            $delegateInfo[] = Delegate::fromArray($data['delegates_' . $i]);
+                        } else {
+                            $delegateInfo[] = Delegate::emptyObject();
+                        }
                     }
 
                     $command = new CompletePurchase($purchaseId, $data['purchase_email'], ...$delegateInfo);

diff --git a/src/Domain/Service/Configuration.php b/src/Domain/Service/Configuration.php
@@ -112,7 +112,7 @@ class Configuration
      *
      * @var DiscountCode[]
      */
-    private $discountCodes;
+    private $discountCodes = [];
 
     /**
      * Contains metadata about tickets eg when they are available for sale
@@ -179,7 +179,8 @@ private function addTicketInformation(array $ticket, string $identifier)
             $identifier,
             $price,
             $ticket['name'],
-            $ticket['description'] ?? ''
+            $ticket['description'] ?? '',
+            $ticket['supplementary'] ?? false
         );
 
         $this->avaliableTickets[$identifier] = $ticket['available'];

diff --git a/src/Domain/ValueObject/TicketType.php b/src/Domain/ValueObject/TicketType.php
@@ -40,12 +40,25 @@ final class TicketType
      */
     private $description;
 
-    public function __construct(string $identifier, Price $price, string $displayName, string $description = '')
-    {
+    /**
+     * @var boolean
+     * @Jms\Type("boolean")
+     * @ORM\Column(type="boolean")
+     */
+    private $supplementary = false;
+
+    public function __construct(
+        string $identifier,
+        Price $price,
+        string $displayName,
+        string $description = '',
+        bool $supplementary = false
+    ) {
         $this->identifier = $identifier;
         $this->price = $price;
         $this->displayName = $displayName;
         $this->description = $description;
+        $this->supplementary = $supplementary;
     }
 
     public function getIdentifier(): string
@@ -67,4 +80,9 @@ public function getDescription(): string
     {
         return $this->description;
     }
+
+    public function isSupplementary(): bool
+    {
+        return $this->supplementary;
+    }
 }
diff --git a/src/Form/PurchaseForm.php b/src/Form/PurchaseForm.php
@@ -2,6 +2,8 @@
 
 namespace ConferenceTools\Tickets\Form;
 
+use ConferenceTools\Tickets\Domain\ReadModel\TicketRecord\PurchaseRecord;
+use ConferenceTools\Tickets\Domain\ReadModel\TicketRecord\TicketRecord;
 use ConferenceTools\Tickets\Domain\ValueObject\Delegate;
 use ConferenceTools\Tickets\Form\Fieldset\DelegateInformation;
 use ConferenceTools\Tickets\Hydrator\DelegateHydrator;
@@ -15,7 +17,7 @@
 
 class PurchaseForm extends Form
 {
-    public function __construct($tickets)
+    public function __construct(PurchaseRecord $purchase)
     {
         parent::__construct('delegate-form');
         $this->add(['type' => Hidden::class, 'name' => 'stripe_token']);
@@ -28,8 +30,11 @@ public function __construct($tickets)
             ]
         ]);
 
-        for ($i = 0; $i < $tickets; $i++) {
-            $this->add(['type' => DelegateInformation::class, 'name' => 'delegates_' . $i]);
+        foreach ($purchase->getTickets() as $i => $ticket) {
+            /** @var TicketRecord $ticket */
+            if (!$ticket->getTicketType()->isSupplementary()) {
+                $this->add(['type' => DelegateInformation::class, 'name' => 'delegates_' . $i]);
+            }
         }
 
         $this->add(new Csrf('security'));

diff --git a/view/tickets/ticket/complete.phtml b/view/tickets/ticket/complete.phtml
@@ -21,7 +21,10 @@
                                 <?=$ticket->getTicketType()->getDisplayName()?>
                             </td>
                             <td class="col-xs-6">
-                                <a href="<?= $this->serverUrl() . $url?>">Manage</a>
+                                <?php if (!$ticket->getTicketType()->isSupplementary()): ?>
+                                    <a href="<?= $this->serverUrl() . $url?>">Manage</a>
+                                <?php endif;?>
+
                             </td>
                         </tr>
                     <?php endforeach;?>

diff --git a/view/tickets/ticket/purchase.phtml b/view/tickets/ticket/purchase.phtml
@@ -28,20 +28,27 @@ $this->headLink()->appendStylesheet('/css/card.css');
                 </div>
             </div>
 
-            <?php for($i = 0; $i < $purchase->getTicketCount(); $i++):?>
-                <div class="panel panel-default credit-card-box">
-                    <div class="panel-heading display-table" >
-                        <div class="row display-tr" >
-                            <h3 class="panel-title display-td" >Delegate Information <?=$i+1?></h3>
-                            <div class="display-td" ></div>
+            <?php
+            $i = 0;
+            foreach ($this->purchase->getTickets() as $id => $ticket):
+                if (!$ticket->getTicketType()->isSupplementary()):?>
+
+                    <div class="panel panel-default credit-card-box">
+                        <div class="panel-heading display-table" >
+                            <div class="row display-tr" >
+                                <h3 class="panel-title display-td-full" >Delegate Information <?=++$i?> (<?=$ticket->getTicketType()->getDisplayName()?>) </h3>
+                            </div>
+                        </div>
+                        <div class="panel-body">
+                            <p class="help-block">You can complete this information later if you wish</p>
+                            <?php echo $this->formCollection($this->form->get('delegates_' . $id));?>
                         </div>
                     </div>
-                    <div class="panel-body">
-                        <p class="help-block">You can complete this information later if you wish</p>
-                        <?php echo $this->formCollection($this->form->get('delegates_' . $i));?>
-                    </div>
-                </div>
-            <?php endfor;?>
+
+                    <?php
+                endif;
+            endforeach;
+            ?>
             <?php echo $this->formHidden($this->form->get('security'))?>
         </form>
     </div>