Merge pull request #29 from CarltonSoftware/develop

13/3 release

.gitignore

@@ -21,4 +21,6 @@ examples/template/copycontactmethodlanguages.php
 examples/template/copytemplate.php
 examples/template/copytemplatetargetsources.php
 examples/template/copytextitems.php
-examples/sandbox.php
+examples/sandbox.php
+build/logs/
+.phpunit.result.cache

examples/webhooks/subscribing-to-webhooks.php

@@ -12,7 +12,7 @@
 try {
     // Subscribe to all notifications about bookings.  Additional groups are
     // property, actor and admin.
-    \tabs\apiclient\WebHook::subscribe($public_endpoint_url, 'booking');
+    \tabs\apiclient\WebHook::subscribe($public_endpoint_url, 'property', 'MA');
 } catch (Exception $ex) {
     echo $ex->getMessage();
 }

src/tabs/apiclient/Property.php

@@ -625,8 +625,8 @@ function($ele) use ($fromDate, $days) {
                 try {
                     $to = clone $fromDate;
                     for ($i = 0; $i < $weeks; $i++) {
-                        $to->add(new \DateInterval('P7D'));
                         $getPrice($prices, $availablebreaksprices, $to, 7);
+                        $to->add(new \DateInterval('P7D'));
                     }
 
                     if ($to && $add > 0) {

src/tabs/apiclient/WebHook.php

@@ -29,14 +29,20 @@ class WebHook extends Base
      * 
      * @return void
      */
-    public static function subscribe($url, $type = 'property')
+    public static function subscribe($url, $type = 'property', $marketingBrandCode = null)
     {
         try {
+            $args = array(
+                'url' => $url
+            );
+
+            if ($marketingBrandCode) {
+                $args['brandcode'] = $marketingBrandCode;
+            }
+
             $res = \tabs\apiclient\client\Client::getClient()->get(
                 'webhook/subscribe/' . strtolower($type),
-                array(
-                    'url' => $url
-                )
+                $args
             );
 
             if ($res->getStatusCode() != 200) {

src/tabs/apiclient/contact/Entity.php

@@ -164,7 +164,7 @@ public function toArray()
             'reference' => $this->getReference(),
             'contactdetailid' => $this->getContactdetail()->getId(),
             'contactdetailvalue' => $this->getContactdetailvalue(),
-            'perform_send' => $this->getPerformsend() === true ? 'true' : 'false'
+            'perform_send' => $this->getPerformsend() === true ? 'true' : 'false',
         );
 
         if ($this->getCreatedbyactor()) {
@@ -181,6 +181,8 @@ public function toArray()
             );
         }
 
+        //var_dump($arr); die;
+
         return $arr;
     }
 

src/tabs/apiclient/property/Branding.php

@@ -33,7 +33,7 @@
  *
  * @method Branding setShowpricingonwebuntil(\DateTime $var) Sets the showpricingonwebuntil
  *
- * @method Branding setConvertpotentialstoprovisionals(boolean $var) Sets the convertpotentialstoprovisionals
+ * @method Branding setConvertpotentialstoprovisionals(string $var) Sets the convertpotentialstoprovisionals
  * 
  * @method Collection|ChangeDayTemplate[] getChangedaytemplates Returns the change day templates
  * @method Collection|Pricing[] getExtraprices() Returns the property extra prices
@@ -127,7 +127,7 @@ class Branding extends Builder
     protected $showpricingonwebuntil;
 
     /**
-     * @var boolean
+     * @var string
      */
     protected $convertpotentialstoprovisionals;
 
@@ -471,9 +471,9 @@ public function toArray()
         );
 
         if ($this->getConvertpotentialstoprovisionals()) {
-            $arr['convertpotentialstoprovisionals'] = true;
+            $arr['convertpotentialstoprovisionals'] = $this->getConvertpotentialstoprovisionals();
         }
-
+        
         return $arr;
     }
 
@@ -574,7 +574,7 @@ public function getShowpricingonwebuntil()
     /**
      * Returns the convertpotentialstoprovisionals
      *
-     * @return boolean
+     * @return string
      */
     public function getConvertpotentialstoprovisionals()
     {

tests/AvailableBreaksPriceTest.php

@@ -27,11 +27,6 @@ public function testPrices($fromDate, $days, $price)
     public function pricesProvider()
     {
         return array(
-            array(
-                new \DateTime('2018-12-04'),
-                15,
-                1310
-            ),
             array(
                 new \DateTime('2018-12-04'),
                 7,