From e12513bd28ed3a786d0eb1b86fb6ce90f3b85b52 Mon Sep 17 00:00:00 2001
From: Mark Anderson <mark@ilateral.com>
Date: Wed, 10 Oct 2018 13:55:23 +0100
Subject: [PATCH] change support for ss4

---
 _config/googlesitemaps.yml                       |  2 +-
 src/.upgrade.yml                                 |  5 +++++
 {code => src}/GoogleShoppingFeed.php             | 13 ++++++++-----
 .../controllers/GoogleShoppingFeedController.php | 11 +++++++++++
 .../extensions/GoogleShoppingFeedExtension.php   | 16 ++++++++++++++++
 {code => src}/model/GoogleProductCategory.php    |  6 ++++++
 6 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 src/.upgrade.yml
 rename {code => src}/GoogleShoppingFeed.php (96%)
 rename {code => src}/controllers/GoogleShoppingFeedController.php (81%)
 rename {code => src}/extensions/GoogleShoppingFeedExtension.php (93%)
 rename {code => src}/model/GoogleProductCategory.php (93%)

diff --git a/_config/googlesitemaps.yml b/_config/googlesitemaps.yml
index 01531a4..a07ae51 100644
--- a/_config/googlesitemaps.yml
+++ b/_config/googlesitemaps.yml
@@ -1,7 +1,7 @@
 ---
 Name: googleshoppingfeed
 ---
-GoogleShoppingFeed:
+ilateral\SilverStripe\GoogleShoppingFeed\GoogleShoppingFeed:
   enabled: true
   google_notification_enabled: false
   use_show_in_search: true
diff --git a/src/.upgrade.yml b/src/.upgrade.yml
new file mode 100644
index 0000000..8073054
--- /dev/null
+++ b/src/.upgrade.yml
@@ -0,0 +1,5 @@
+mappings:
+  GoogleShoppingFeedExtension: ilateral\SilverStripe\GoogleShoppingFeed\extensions\GoogleShoppingFeedExtension
+  GoogleProductCategory: ilateral\SilverStripe\GoogleShoppingFeed\model\GoogleProductCategory
+  GoogleShoppingFeed: ilateral\SilverStripe\GoogleShoppingFeed\GoogleShoppingFeed
+  GoogleShoppingFeedController: ilateral\SilverStripe\GoogleShoppingFeed\controllers\GoogleShoppingFeedController
diff --git a/code/GoogleShoppingFeed.php b/src/GoogleShoppingFeed.php
similarity index 96%
rename from code/GoogleShoppingFeed.php
rename to src/GoogleShoppingFeed.php
index 95415f2..842eea6 100644
--- a/code/GoogleShoppingFeed.php
+++ b/src/GoogleShoppingFeed.php
@@ -1,4 +1,12 @@
 <?php
+
+namespace ilateral\SilverStripe\GoogleShoppingFeed;
+
+use SilverStripe\ORM\DataList;
+use SilverStripe\ORM\ArrayList;
+use SilverStripe\Core\Config\Config;
+use SilverStripe\Versioned\Versioned;
+
 /**
  * Shopping Feeds are a way to tell Google about pages on your site that they might 
  * not otherwise discover. In its simplest terms, a XML Sitemap usually called 
@@ -130,11 +138,6 @@ public static function get_items()
         $filter = array();
 
         // todo migrate to extension hook or DI point for other modules to 
-        // modify state filters
-        if (class_exists('Translatable')) {
-            Translatable::disable_locale_filter();
-        }
-
         foreach (self::$dataobjects as $class) {
             if ($class == "SiteTree") {
                 $search_filter = ($search_filter) ? "\"ShowInSearch\" = 1" : "";
diff --git a/code/controllers/GoogleShoppingFeedController.php b/src/controllers/GoogleShoppingFeedController.php
similarity index 81%
rename from code/controllers/GoogleShoppingFeedController.php
rename to src/controllers/GoogleShoppingFeedController.php
index f9cfa41..5d82b66 100644
--- a/code/controllers/GoogleShoppingFeedController.php
+++ b/src/controllers/GoogleShoppingFeedController.php
@@ -1,5 +1,16 @@
 <?php
 
+namespace ilateral\SilverStripe\GoogleShoppingFeed\controllers;
+
+use Zend_Currency;
+use SilverStripe\i18n\i18n;
+use SilverStripe\Control\Controller;
+use SilverStripe\Core\Config\Config;
+use SilverStripe\Control\HTTPResponse;
+use SilverStripe\SiteConfig\SiteConfig;
+use ilateral\SilverStripe\GoogleShoppingFeed\GoogleShoppingFeed;
+
+
 require_once BASE_PATH . "/" . THIRDPARTY_DIR . "/Zend/Currency.php";
 
 /**
diff --git a/code/extensions/GoogleShoppingFeedExtension.php b/src/extensions/GoogleShoppingFeedExtension.php
similarity index 93%
rename from code/extensions/GoogleShoppingFeedExtension.php
rename to src/extensions/GoogleShoppingFeedExtension.php
index 4346b0e..5759e8c 100644
--- a/code/extensions/GoogleShoppingFeedExtension.php
+++ b/src/extensions/GoogleShoppingFeedExtension.php
@@ -1,5 +1,21 @@
 <?php
 
+namespace ilateral\SilverStripe\GoogleShoppingFeed\extensions;
+
+use SilverStripe\Assets\Image;
+use SilverStripe\ORM\ArrayList;
+use SilverStripe\View\ArrayData;
+use SilverStripe\Forms\FieldList;
+use SilverStripe\Forms\TextField;
+use SilverStripe\Control\Director;
+use SilverStripe\ORM\DataExtension;
+use SilverStripe\Forms\CheckboxField;
+use SilverStripe\Forms\DropdownField;
+use SilverStripe\Forms\ToggleCompositeField;
+use SilverStripe\AssetAdmin\Forms\UploadField;
+use TractorCow\AutoComplete\AutoCompleteField;
+
+
 class GoogleShoppingFeedExtension extends DataExtension
 {
     
diff --git a/code/model/GoogleProductCategory.php b/src/model/GoogleProductCategory.php
similarity index 93%
rename from code/model/GoogleProductCategory.php
rename to src/model/GoogleProductCategory.php
index 151325f..32ed726 100644
--- a/code/model/GoogleProductCategory.php
+++ b/src/model/GoogleProductCategory.php
@@ -1,5 +1,11 @@
 <?php
 
+namespace ilateral\SilverStripe\GoogleShoppingFeed\model;
+
+use SilverStripe\ORM\DB;
+use SilverStripe\ORM\DataObject;
+
+
 class GoogleProductCategory extends DataObject
 {
     private static $db = [