enhancement - implement CustomSSL option in 4 brach (#351)

fixes #322
dynamic · Nov 6, 2018 · f0bcb32 · f0bcb32
1 parent 852c6ef
commit f0bcb32
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/src/Model/FoxyCart.php b/src/Model/FoxyCart.php
@@ -58,7 +58,7 @@ public static function store_name_warning()
     {
         $warning = null;
         if (self::getFoxyCartStoreName() === null) {
-            $warning = 'Must define FoxyCart Store Name in your site settings in the cms';
+            $warning = 'Must define FoxyCart Store Name or Store Remote Domain in your site settings in the cms';
         }
 
         return $warning;
@@ -71,8 +71,14 @@ public static function store_name_warning()
     public static function getFoxyCartStoreName()
     {
         $config = FoxyStripeSetting::current_foxystripe_setting();
-        if ($config->StoreName) {
-            return $config->StoreName;
+        if ($config->CustomSSL) {
+            if ($config->RemoteDomain) {
+                return $config->RemoteDomain;
+            }
+        } else {
+            if ($config->StoreName) {
+                return $config->StoreName;
+            }
         }
 
         return false;
@@ -84,7 +90,11 @@ public static function getFoxyCartStoreName()
      */
     public static function FormActionURL()
     {
-        return sprintf('https://%s.foxycart.com/cart', self::getFoxyCartStoreName());
+        if ($config->CustomSSL) {
+            return sprintf('https://%s/cart', self::getFoxyCartStoreName());
+        } else {
+            return sprintf('https://%s.foxycart.com/cart', self::getFoxyCartStoreName());
+        }
     }
 
     /**

diff --git a/src/Model/FoxyStripeSetting.php b/src/Model/FoxyStripeSetting.php
@@ -81,6 +81,8 @@ class FoxyStripeSetting extends DataObject implements PermissionProvider, Templa
     private static $db = [
         'StoreTitle' => 'Varchar(255)',
         'StoreName' => 'Varchar(255)',
+        'CustomSSL' => 'Boolean',
+        'RemoteDomain' => 'Varchar(255)',
         'StoreURL' => 'Varchar(255)',
         'ReceiptURL' => 'Varchar(255)',
         'StoreEmail' => 'Varchar(255)',
@@ -161,12 +163,21 @@ public function getCMSFields()
                     'FoxyStripeSiteConfig.StoreTitleDescription',
                     'The name of your store as you\'d like it displayed to your customers'
                 )),
+            CheckboxField::create('CustomSSL', 'Use custom SSL'),
+            TextField::create('RemoteDomain')
+                ->setTitle(_t('FoxyStripeSiteConfig.RemoteDomain', 'Store Remote Domain'))
+                ->setDescription(_t(
+                    'FoxyStripeSiteConfig.RemoteDomainDescription',
+                    'custom subdomain for FoxyCart'
+                ))
+                ->displayIf('CustomSSL')->isChecked()->end(),
             TextField::create('StoreName')
                 ->setTitle(_t('FoxyStripeSiteConfig.StoreName', 'Store Domain'))
                 ->setDescription(_t(
                     'FoxyStripeSiteConfig.StoreNameDescription',
                     'This is a unique FoxyCart subdomain for your cart, checkout, and receipt'
-                )),
+                ))
+                ->hideIf('CustomSSL')->isChecked()->end(),
             TextField::create('StoreURL')
                 ->setTitle(_t('FoxyStripeSiteConfig.StoreURL', 'Store URL'))
                 ->setDescription(_t(