refactor storeService

HabitRPG · May 25, 2015 · 76ea0e5 · 76ea0e5
1 parent f700ef9
commit 76ea0e5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/scripts/controllers/purchaseCtrl.js b/scripts/controllers/purchaseCtrl.js
@@ -3,8 +3,6 @@
 habitrpg.controller('PurchaseCtrl', 
   ['$scope', 'StoreService', '$rootScope', 'ApiUrl',
   function($scope, store, $rootScope, ApiUrl){
-    $scope.store = store.getStore();
-
     $scope.buy = function(id){
       if($rootScope.isIOS){
         alert("In-App-Purchases are currently not available on IOS.");
@@ -17,7 +15,7 @@ habitrpg.controller('PurchaseCtrl',
       }
 
       try{
-        $scope.store.order(id)
+        store.getStore().order(id)
           .then(function(ex){
             // Callback Order started
           })

diff --git a/scripts/services/storeService.js b/scripts/services/storeService.js
@@ -39,25 +39,43 @@ function(ApiUrl, $rootScope, User, $ionicPlatform, $timeout){
       });
   }
 
-  $ionicPlatform.ready(function() {
+  var storeInitialized = false;
+
+  function initializeStore()
+  {
     if(w.store){
       registerProductAndCallback({
         id: "buy.20.gems",
         alias: "20 Gems",
         type: w.store.CONSUMABLE
       });
-    
+
       w.store.ready(function(){
         // store is ready :)
       });
 
       $timeout(function(){
         w.store.refresh();
       }, 250);
+
+      storeInitialized = true;
+    }
+    else
+    {
+      console.log("No store available");
     }
+  }
+
+  $ionicPlatform.ready(function() {
+    $timeout(initializeStore, 500);
   });
 
   this.getStore = function(){
+    if(!storeInitialized)
+    {
+      initializeStore();
+    }
+
     return w.store || {};
   };
 }]);