Refactor

.gitignore

@@ -1,3 +1,3 @@
 vendor
 composer.phar
-composer.lock
+composer.lock

.travis.yml

@@ -5,5 +5,4 @@ php:
   - 5.4
 
 before_script:
-  - wget http://getcomposer.org/composer.phar
-  - php composer.phar install
+  - composer install

README.md

@@ -0,0 +1,3 @@
+Pricing
+=======
+

composer.json

@@ -1,14 +1,24 @@
 {
     "name": "vespolina/core",
     "type": "entities",
-    "description": "Core code for the various Vespolina bundles, but not specific to Vespolina",
-    "keywords": ["ecommerce"],
+    "description": "Core entities for the Vespolina Project",
+    "keywords": ["ecommerce", "shop"],
     "homepage": "https://github.com/vespolina/VespolinaCore",
     "license": "MIT",
     "require": {
         "php": ">=5.3.2"
     },
+    "require": {
+        "php": ">=5.3.2",
+        "pimple/pimple": "*",
+	"doctrine/common": "*"
+    },
     "autoload": {
         "psr-0": { "Vespolina": "lib/" }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
     }
-}
+}

lib/ImmersiveLabs/Pricing/Entity/Element/RecurringElement.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace ImmersiveLabs\Pricing\Entity\Element;
+
+use ImmersiveLabs\Pricing\Entity\PricingElement;
+
+class RecurringElement extends PricingElement
+{
+    public function __construct()
+    {
+        $this->attributes['cycles']  = '';
+        $this->attributes['recurringCharge'] = '';
+        $this->attributes['interval']  = '';
+        $this->attributes['startsIn'] = null;
+
+        parent::__construct();
+    }
+
+    public function setCycles($cycles)
+    {
+        $this->attributes['cycles'] = $cycles;
+
+        return $this;
+    }
+
+    public function getCycles()
+    {
+        return $this->attributes['cycles'];
+    }
+
+    public function setInterval($interval)
+    {
+        $this->attributes['interval'] = $interval;
+
+        return $this;
+    }
+
+    public function getInterval()
+    {
+        return $this->attributes['interval'];
+    }
+
+    public function setRecurringCharge($recurringCharge)
+    {
+        $this->attributes['recurringCharge'] = $recurringCharge;
+
+        return $this;
+    }
+
+    public function getRecurringCharge()
+    {
+        return $this->attributes['recurringCharge'];
+    }
+
+    public function setStartsIn($startsIn)
+    {
+        $this->attributes['startsIn'] = $startsIn;
+
+        return $this;
+    }
+
+    public function getStartsIn()
+    {
+        return $this->attributes['startsIn'];
+    }
+
+    protected function doProcess($context, $processed)
+    {
+        $processed['netValue'] = $this->attributes['netValue'];
+        $processed['recurringCharge'] = $this->attributes['recurringCharge'];
+        $processed['interval'] = $this->attributes['interval'];
+        $processed['cycles'] = $this->attributes['cycles'];
+        if (!$this->attributes['startsIn']) {
+            $processed['startsOn'] = new \DateTime('today +' . $processed['interval']);
+        } else {
+            $processed['startsOn'] = new \DateTime('today +' . $this->attributes['startsIn']);
+        }
+
+        return $processed;
+    }
+}

lib/ImmersiveLabs/Pricing/Entity/Element/TotalValueElement.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace ImmersiveLabs\Pricing\Entity\Element;
+
+<<<<<<< HEAD:lib/ImmersiveLabs/Pricing/Entity/Element/TotalValueElement.php
+use ImmersiveLabs\Pricing\Entity\PricingElement;
+=======
+use Vespolina\Entity\Pricing\PricingElement;
+use Vespolina\Entity\Pricing\PricingElementValueInterface;
+>>>>>>> updates to pricing set code:lib/Vespolina/Entity/Pricing/Element/TotalValueElement.php
+
+class TotalValueElement extends PricingElement implements PricingElementValueInterface
+{
+    protected $position = 100000;
+
+    public function add($augend, $addend)
+    {
+        throw new FunctionNotSupportedException('add() has not been implemented in ' . get_class($this));
+    }
+
+    public function subtract($minuend, $subtrahend)
+    {
+        throw new FunctionNotSupportedException('subtract() has not been implemented in ' . get_class($this));
+    }
+
+    protected function doProcess($context, $processed)
+    {
+        $totalValue = $processed['netValue'];
+        // todo: calculate other preset groups 'discounts', 'surcharge', 'taxes'
+
+        $processed['totalValue'] = $totalValue;
+
+        return $processed;
+    }
+}

lib/ImmersiveLabs/Pricing/Entity/PricingElement.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace ImmersiveLabs\Pricing\Entity;
+
+use Vespolina\Entity\Pricing\PricingElementInterface;
+use Vespolina\Entity\Pricing\PricingSetInterface;
+use Vespolina\Exception\FunctionNotSupportedException;
+
+class PricingElement implements PricingElementInterface
+{
+    protected $id;
+    protected $attributes;
+    protected $position;
+    protected $pricingSet;
+    protected $type;
+
+    public function __construct()
+    {
+        $this->attributes['netValue']  = '';
+    }
+
+    public function setNetValue($netValue)
+    {
+        $this->attributes['netValue']  = $netValue;
+
+        return $this;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function process($context, $processed)
+    {
+        return $this->doProcess($context, $processed);
+    }
+
+    protected function doProcess($context, $processed)
+    {
+        throw new FunctionNotSupportedException('process() has not been implemented in ' . get_class($this));
+    }
+
+    /**
+     * Set the order of this element being processed. If the order is not set, it is saved until the end of the
+     * processing to be executed. The higher the number, the later it is executed.
+     *
+     * @param integer $position
+     * @return \ImmersiveLabs\Pricing\Entity\PricingElement
+     */
+    function setPosition($position)
+    {
+        $this->position = $position;
+
+        return $this;
+    }
+
+    /**
+     * Return the order of this element's execution
+     *
+     * @return integer
+     */
+    function getPosition()
+    {
+        return $this->position;
+    }
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function setPricingSet(PricingSetInterface $pricingSet)
+    {
+        $this->pricingSet = $pricingSet;
+
+        return $this;
+    }
+
+    public function getPricingSet()
+    {
+        return $this->pricingSet;
+    }
+}