Form-Validierung angepasst

platforms/android/build/intermediates/assets/debug/www/cordova_plugins.js

@@ -46,6 +46,15 @@ module.exports = [
             "cordova.plugins.Keyboard"
         ],
         "runs": true
+    },
+    {
+        "file": "plugins/cordova-plugin-inappbrowser/www/inappbrowser.js",
+        "id": "cordova-plugin-inappbrowser.inappbrowser",
+        "pluginId": "cordova-plugin-inappbrowser",
+        "clobbers": [
+            "cordova.InAppBrowser.open",
+            "window.open"
+        ]
     }
 ];
 module.exports.metadata = 
@@ -57,7 +66,8 @@ module.exports.metadata =
     "cordova-plugin-splashscreen": "3.0.0",
     "cordova-plugin-statusbar": "2.0.0",
     "cordova-plugin-whitelist": "1.2.0",
-    "ionic-plugin-keyboard": "1.0.8"
+    "ionic-plugin-keyboard": "1.0.8",
+    "cordova-plugin-inappbrowser": "1.1.1"
 }
 // BOTTOM OF METADATA
 });

platforms/android/build/intermediates/assets/debug/www/js/controllers.js

@@ -1,6 +1,6 @@
 angular.module('starter.controllers', [])
 
-.controller('DashCtrl', function($scope,$ionicPopup) {
+.controller('DashCtrl', function($scope,$ionicPopup,$http) {
 
   $scope.preis="";
   $scope.name="";
@@ -18,7 +18,16 @@ angular.module('starter.controllers', [])
 
     if (showAlert==1){
       $scope.showAlert();
+      return;
     }
+
+    var link = 'http://api.raataar.de/rosen/vorschau.php';
+
+    $http.post(link, {name : $scope.name, freitext: $scope.freitext, rosen: $scope.preis}).then(function (res){
+        $scope.response = res.data;
+        window.open($scope.response, '_system', 'location=yes'); 
+        return false;
+    });
     
   };
 
@@ -32,7 +41,11 @@ angular.module('starter.controllers', [])
    });
  };
 
-    function successHandler (result) {
+  function buysuccessHandler (result) {
+      inappbilling.consumePurchase(successHandler, errorHandler, "3xrose");
+  }
+
+  function successHandler (result) {
       var strResult = "";
       if(typeof result === 'object') {
         strResult = JSON.stringify(result);
@@ -40,25 +53,18 @@ angular.module('starter.controllers', [])
         strResult = result;
       }
       alert("SUCCESS: \r\n"+strResult );
-    }
+  }
 
-    function errorHandler (error) {
+  function errorHandler (error) {
       alert("ERROR: \r\n"+error );
     }
 
  $scope.buyAdFree = function() {
 
-
-
+    alert($scope.preis);
 
         if((window.device && device.platform == "Android") && typeof inappbilling !== "undefined") {
-            
-
-          alert($scope.preis);
-          inappbilling.buy(successHandler, errorHandler,"3xrose");
-          inappbilling.consumePurchase(successHandler, errorHandler, "3xrose");
-
-
+          inappbilling.buy(buysuccessHandler, errorHandler,"3xrose");
         }
     }
 

platforms/android/build/intermediates/assets/debug/www/plugins/cordova-plugin-inappbrowser/www/inappbrowser.js

@@ -0,0 +1,112 @@
+cordova.define("cordova-plugin-inappbrowser.inappbrowser", function(require, exports, module) { /*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+
+// special patch to correctly work on Ripple emulator (CB-9760)
+if (window.parent && !!window.parent.ripple) { // https://gist.github.com/triceam/4658021
+    module.exports = window.open.bind(window); // fallback to default window.open behaviour
+    return;
+}
+
+var exec = require('cordova/exec');
+var channel = require('cordova/channel');
+var modulemapper = require('cordova/modulemapper');
+var urlutil = require('cordova/urlutil');
+
+function InAppBrowser() {
+   this.channels = {
+        'loadstart': channel.create('loadstart'),
+        'loadstop' : channel.create('loadstop'),
+        'loaderror' : channel.create('loaderror'),
+        'exit' : channel.create('exit')
+   };
+}
+
+InAppBrowser.prototype = {
+    _eventHandler: function (event) {
+        if (event && (event.type in this.channels)) {
+            this.channels[event.type].fire(event);
+        }
+    },
+    close: function (eventname) {
+        exec(null, null, "InAppBrowser", "close", []);
+    },
+    show: function (eventname) {
+      exec(null, null, "InAppBrowser", "show", []);
+    },
+    addEventListener: function (eventname,f) {
+        if (eventname in this.channels) {
+            this.channels[eventname].subscribe(f);
+        }
+    },
+    removeEventListener: function(eventname, f) {
+        if (eventname in this.channels) {
+            this.channels[eventname].unsubscribe(f);
+        }
+    },
+
+    executeScript: function(injectDetails, cb) {
+        if (injectDetails.code) {
+            exec(cb, null, "InAppBrowser", "injectScriptCode", [injectDetails.code, !!cb]);
+        } else if (injectDetails.file) {
+            exec(cb, null, "InAppBrowser", "injectScriptFile", [injectDetails.file, !!cb]);
+        } else {
+            throw new Error('executeScript requires exactly one of code or file to be specified');
+        }
+    },
+
+    insertCSS: function(injectDetails, cb) {
+        if (injectDetails.code) {
+            exec(cb, null, "InAppBrowser", "injectStyleCode", [injectDetails.code, !!cb]);
+        } else if (injectDetails.file) {
+            exec(cb, null, "InAppBrowser", "injectStyleFile", [injectDetails.file, !!cb]);
+        } else {
+            throw new Error('insertCSS requires exactly one of code or file to be specified');
+        }
+    }
+};
+
+module.exports = function(strUrl, strWindowName, strWindowFeatures, callbacks) {
+    // Don't catch calls that write to existing frames (e.g. named iframes).
+    if (window.frames && window.frames[strWindowName]) {
+        var origOpenFunc = modulemapper.getOriginalSymbol(window, 'open');
+        return origOpenFunc.apply(window, arguments);
+    }
+
+    strUrl = urlutil.makeAbsolute(strUrl);
+    var iab = new InAppBrowser();
+
+    callbacks = callbacks || {};
+    for (var callbackName in callbacks) {
+        iab.addEventListener(callbackName, callbacks[callbackName]);
+    }
+
+    var cb = function(eventname) {
+       iab._eventHandler(eventname);
+    };
+
+    strWindowFeatures = strWindowFeatures || "";
+
+    exec(cb, cb, "InAppBrowser", "open", [strUrl, strWindowName, strWindowFeatures]);
+    return iab;
+};
+
+
+});

platforms/android/build/intermediates/assets/debug/www/templates/tab-dash.html

@@ -20,9 +20,9 @@
         <div style="padding-bottom:15px;">
           <div class="item item-divider oswald">Wählen Sie Ihre Rosen aus</div>
           <ion-list>
-            <ion-radio ng-model="preis" ng-value="'1xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose1.png"><h2 class="lobster">1 Rose </h2><p>Preis: 0,50 €</p></ion-radio>
-            <ion-radio ng-model="preis" ng-value="'3xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose3.png"><h2 class="lobster">3 Rosen</h2><p>Preis: 1,00 €</p></ion-radio>
-            <ion-radio ng-model="preis" ng-value="'9xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose10.png"><h2 class="lobster">9 Rosen</h2><p>Preis: 2,00 €</p></ion-radio>
+            <ion-radio ng-model="$parent.preis" ng-value="'1xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose1.png"><h2 class="lobster">1 Rose </h2><p>Preis: 0,50 € (inkl. Mwst 0,59 €)</p></ion-radio>
+            <ion-radio ng-model="$parent.preis" ng-value="'3xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose3.png"><h2 class="lobster">3 Rosen</h2><p>Preis: 1,00 € (inkl. Mwst 1,19 €)</p></ion-radio>
+            <ion-radio ng-model="$parent.preis" ng-value="'9xrose'" class="item item-thumbnail-left item-text-wrap"><img src="img/rose10.png"><h2 class="lobster">9 Rosen</h2><p>Preis: 2,00 € (inkl. Mwst 2,38 €)</p></ion-radio>
           </ion-list>
             <label class="item item-input item-select">
               <div class="input-label">
@@ -37,14 +37,14 @@
         </div>
         <div class="item item-divider oswald">Rosen kaufen?</div>
 
+
         <div class="row">
-          <div class="col"><h1 class="lobster">Preis: <span>{{preis}} €</span></h1></div>
-          <div class="col"><br>
-              <button class="button button-small icon-left ion-image button-custom" ng-click="validate()">Vorschau</button>
-              <button class="button button-small icon-left ion-social-euro button-custom" ng-click="buyAdFree()">Jetzt Kaufen</button>
-          </div>
+          <div class="col col-50"><button class="button button-full button-small icon-left ion-image button-custom" ng-disabled="!$parent.preis || !$parent.name || !$parent.freitext" ng-click="validate()">Vorschau</button></div>
+          <div class="col col-50"><button class="button button-full button-small icon-left ion-social-euro button-custom" ng-disabled="!$parent.preis || !$parent.freitext || !$parent.name" ng-click="buyAdFree()">Jetzt Kaufen</button></div>
         </div>
 
+       
+
       </div>
     </div>
   </ion-content>