Raataar/Wolle-Rosen-Kaufen
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Flatratekaufprozess eingebaut und vorbereitet

Browse Source
This commit is contained in:
Carsten Hilmer 2016-02-02 16:25:48 +01:00
parent 5e25c4ca61
commit cfb60396ea
21 changed files with 128 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock
View File

Binary file not shown.

BIN
platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin
View File

Binary file not shown.

BIN
platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
View File

Binary file not shown.

BIN
platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
View File

Binary file not shown.

79
platforms/android/.idea/workspace.xml generated
View File

@ -41,30 +41,11 @@
<file leaf-file-name="InAppBrowser.java" pinned="false" current-in-tab="true"> <file leaf-file-name="InAppBrowser.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/org/apache/cordova/inappbrowser/InAppBrowser.java"> <entry file="file://$PROJECT_DIR$/src/org/apache/cordova/inappbrowser/InAppBrowser.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.36452243">
<caret line="11" column="65" selection-start-line="11" selection-start-column="65" selection-end-line="11" selection-end-column="65" /> <caret line="70" column="37" selection-start-line="70" selection-start-column="37" selection-end-line="70" selection-end-column="37" />
<folding> <folding>
<element signature="imports" expanded="false" /> <element signature="imports" expanded="false" />
<element signature="e#11275#11276#0" expanded="false" /> <element signature="e#14236#14253#0" expanded="false" />
<element signature="e#11328#11329#0" expanded="false" />
<element signature="e#11725#11726#0" expanded="false" />
<element signature="e#11754#11755#0" expanded="false" />
<element signature="e#11886#11887#0" expanded="false" />
<element signature="e#11915#11916#0" expanded="false" />
<element signature="e#17659#17660#0" expanded="false" />
<element signature="e#17711#17712#0" expanded="false" />
<element signature="e#17847#17848#0" expanded="false" />
<element signature="e#17887#17888#0" expanded="false" />
<element signature="e#18821#18822#0" expanded="false" />
<element signature="e#18864#18865#0" expanded="false" />
<element signature="e#18909#18910#0" expanded="false" />
<element signature="e#18936#18937#0" expanded="false" />
<element signature="e#23966#23967#0" expanded="false" />
<element signature="e#24022#24023#0" expanded="false" />
<element signature="e#25159#25160#0" expanded="false" />
<element signature="e#25218#25219#0" expanded="false" />
<element signature="e#27732#27733#0" expanded="false" />
<element signature="e#27793#27794#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -74,7 +55,7 @@
<entry file="file://$PROJECT_DIR$/assets/www/js/controllers.js"> <entry file="file://$PROJECT_DIR$/assets/www/js/controllers.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="335" column="29" selection-start-line="335" selection-start-column="29" selection-end-line="335" selection-end-column="29" /> <caret line="360" column="27" selection-start-line="360" selection-start-column="27" selection-end-line="360" selection-end-column="27" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -1272,7 +1253,7 @@
</option> </option>
<option name="modificationStamps"> <option name="modificationStamps">
<map> <map>
<entry key="$PROJECT_DIR$" value="5817669557281" /> <entry key="$PROJECT_DIR$" value="5817673031156" />
</map> </map>
</option> </option>
<option name="projectBuildClasspath"> <option name="projectBuildClasspath">
@ -1863,7 +1844,7 @@
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3287841" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3287841" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
@ -1912,26 +1893,7 @@
<caret line="11" column="65" selection-start-line="11" selection-start-column="65" selection-end-line="11" selection-end-column="65" /> <caret line="11" column="65" selection-start-line="11" selection-start-column="65" selection-end-line="11" selection-end-column="65" />
<folding> <folding>
<element signature="imports" expanded="false" /> <element signature="imports" expanded="false" />
<element signature="e#11275#11276#0" expanded="false" /> <element signature="e#14236#14253#0" expanded="false" />
<element signature="e#11328#11329#0" expanded="false" />
<element signature="e#11725#11726#0" expanded="false" />
<element signature="e#11754#11755#0" expanded="false" />
<element signature="e#11886#11887#0" expanded="false" />
<element signature="e#11915#11916#0" expanded="false" />
<element signature="e#17659#17660#0" expanded="false" />
<element signature="e#17711#17712#0" expanded="false" />
<element signature="e#17847#17848#0" expanded="false" />
<element signature="e#17887#17888#0" expanded="false" />
<element signature="e#18821#18822#0" expanded="false" />
<element signature="e#18864#18865#0" expanded="false" />
<element signature="e#18909#18910#0" expanded="false" />
<element signature="e#18936#18937#0" expanded="false" />
<element signature="e#23966#23967#0" expanded="false" />
<element signature="e#24022#24023#0" expanded="false" />
<element signature="e#25159#25160#0" expanded="false" />
<element signature="e#25218#25219#0" expanded="false" />
<element signature="e#27732#27733#0" expanded="false" />
<element signature="e#27793#27794#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -1963,7 +1925,7 @@
<entry file="file://$PROJECT_DIR$/assets/www/js/controllers.js"> <entry file="file://$PROJECT_DIR$/assets/www/js/controllers.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="335" column="29" selection-start-line="335" selection-start-column="29" selection-end-line="335" selection-end-column="29" /> <caret line="360" column="27" selection-start-line="360" selection-start-column="27" selection-end-line="360" selection-end-column="27" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -1978,30 +1940,11 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/org/apache/cordova/inappbrowser/InAppBrowser.java"> <entry file="file://$PROJECT_DIR$/src/org/apache/cordova/inappbrowser/InAppBrowser.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.36452243">
<caret line="11" column="65" selection-start-line="11" selection-start-column="65" selection-end-line="11" selection-end-column="65" /> <caret line="70" column="37" selection-start-line="70" selection-start-column="37" selection-end-line="70" selection-end-column="37" />
<folding> <folding>
<element signature="imports" expanded="false" /> <element signature="imports" expanded="false" />
<element signature="e#11275#11276#0" expanded="false" /> <element signature="e#14236#14253#0" expanded="false" />
<element signature="e#11328#11329#0" expanded="false" />
<element signature="e#11725#11726#0" expanded="false" />
<element signature="e#11754#11755#0" expanded="false" />
<element signature="e#11886#11887#0" expanded="false" />
<element signature="e#11915#11916#0" expanded="false" />
<element signature="e#17659#17660#0" expanded="false" />
<element signature="e#17711#17712#0" expanded="false" />
<element signature="e#17847#17848#0" expanded="false" />
<element signature="e#17887#17888#0" expanded="false" />
<element signature="e#18821#18822#0" expanded="false" />
<element signature="e#18864#18865#0" expanded="false" />
<element signature="e#18909#18910#0" expanded="false" />
<element signature="e#18936#18937#0" expanded="false" />
<element signature="e#23966#23967#0" expanded="false" />
<element signature="e#24022#24023#0" expanded="false" />
<element signature="e#25159#25160#0" expanded="false" />
<element signature="e#25218#25219#0" expanded="false" />
<element signature="e#27732#27733#0" expanded="false" />
<element signature="e#27793#27794#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>

BIN
platforms/android/android-release.apk
View File

Binary file not shown.

1
platforms/android/assets/www/js/app.js
View File

@ -17,6 +17,7 @@ angular.module('starter', ['ionic', 'ngCordova', 'starter.controllers', 'starter
$rootScope.storeinit=99; $rootScope.storeinit=99;
$rootScope.flatrate=0;
$ionicPlatform.registerBackButtonAction(function(event) { $ionicPlatform.registerBackButtonAction(function(event) {

30
platforms/android/assets/www/js/controllers.js
View File

@ -145,8 +145,15 @@ $scope.show = function() {
if((window.device && device.platform == "Android") && typeof inappbilling !== "undefined") { if((window.device && device.platform == "Android") && typeof inappbilling !== "undefined") {
if ($rootScope.storeinit==1){ if ($rootScope.storeinit==1 && $rootScope.flatrate==0){
inappbilling.buy(successBuyHandler, errorBuyHandler, $scope.preis);
if ($scope.preis=='rosenflatrate'){
inappbilling.buy(successBuyOnceHandler, errorBuyHandler, $scope.preis);
}
else{
inappbilling.buy(successBuyHandler, errorBuyHandler, $scope.preis);
}
} }
else{ else{
var alertPopup = $ionicPopup.alert({ var alertPopup = $ionicPopup.alert({
@ -198,7 +205,26 @@ $scope.show = function() {
function successBuyHandler (result) { function successBuyHandler (result) {
if ($rootScope.flatrate==1){
//Kein Konsum auslösem direkt zum Download
$timeout(successConsumeHandler, 200);
}
else{
//Kein Konsum auslösem
$timeout(consumesuccessHandler, 500); $timeout(consumesuccessHandler, 500);
}
}
function successBuyOnceHandler (result) {
$rootScope.flatrate=1;
$scope.showflatrate = false;
$scope.rosen1preistag="kostenlos - Flaterate";
$scope.rosen3preistag="kostenlos - Flaterate";
$scope.rosen9preistag="kostenlos - Flaterate";
} }
/* /*

1
platforms/android/build/intermediates/assets/debug/www/js/app.js
View File

@ -17,6 +17,7 @@ angular.module('starter', ['ionic', 'ngCordova', 'starter.controllers', 'starter
$rootScope.storeinit=99; $rootScope.storeinit=99;
$rootScope.flatrate=0;
$ionicPlatform.registerBackButtonAction(function(event) { $ionicPlatform.registerBackButtonAction(function(event) {

30
platforms/android/build/intermediates/assets/debug/www/js/controllers.js
View File

@ -145,8 +145,15 @@ $scope.show = function() {
if((window.device && device.platform == "Android") && typeof inappbilling !== "undefined") { if((window.device && device.platform == "Android") && typeof inappbilling !== "undefined") {
if ($rootScope.storeinit==1){ if ($rootScope.storeinit==1 && $rootScope.flatrate==0){
inappbilling.buy(successBuyHandler, errorBuyHandler, $scope.preis);
if ($scope.preis=='rosenflatrate'){
inappbilling.buy(successBuyOnceHandler, errorBuyHandler, $scope.preis);
}
else{
inappbilling.buy(successBuyHandler, errorBuyHandler, $scope.preis);
}
} }
else{ else{
var alertPopup = $ionicPopup.alert({ var alertPopup = $ionicPopup.alert({
@ -198,7 +205,26 @@ $scope.show = function() {
function successBuyHandler (result) { function successBuyHandler (result) {
if ($rootScope.flatrate==1){
//Kein Konsum auslösem direkt zum Download
$timeout(successConsumeHandler, 200);
}
else{
//Kein Konsum auslösem
$timeout(consumesuccessHandler, 500); $timeout(consumesuccessHandler, 500);
}
}
function successBuyOnceHandler (result) {
$rootScope.flatrate=1;
$scope.showflatrate = false;
$scope.rosen1preistag="kostenlos - Flaterate";
$scope.rosen3preistag="kostenlos - Flaterate";
$scope.rosen9preistag="kostenlos - Flaterate";
} }
/* /*

1
platforms/android/build/intermediates/assets/release/www/js/app.js
View File

@ -17,6 +17,7 @@ angular.module('starter', ['ionic', 'ngCordova', 'starter.controllers', 'starter
$rootScope.storeinit=99; $rootScope.storeinit=99;
$rootScope.flatrate=0;
$ionicPlatform.registerBackButtonAction(function(event) { $ionicPlatform.registerBackButtonAction(function(event) {

30
platforms/android/build/intermediates/assets/release/www/js/controllers.js
View File

@ -145,8 +145,15 @@ $scope.show = function() {
if((window.device && device.platform == "Android") && typeof inappbilling !== "undefined") { if((window.device && device.platform == "Android") && typeof inappbilling !== "undefined") {
if ($rootScope.storeinit==1){ if ($rootScope.storeinit==1 && $rootScope.flatrate==0){
inappbilling.buy(successBuyHandler, errorBuyHandler, $scope.preis);
if ($scope.preis=='rosenflatrate'){
inappbilling.buy(successBuyOnceHandler, errorBuyHandler, $scope.preis);
}
else{
inappbilling.buy(successBuyHandler, errorBuyHandler, $scope.preis);
}
} }
else{ else{
var alertPopup = $ionicPopup.alert({ var alertPopup = $ionicPopup.alert({
@ -198,7 +205,26 @@ $scope.show = function() {
function successBuyHandler (result) { function successBuyHandler (result) {
if ($rootScope.flatrate==1){
//Kein Konsum auslösem direkt zum Download
$timeout(successConsumeHandler, 200);
}
else{
//Kein Konsum auslösem
$timeout(consumesuccessHandler, 500); $timeout(consumesuccessHandler, 500);
}
}
function successBuyOnceHandler (result) {
$rootScope.flatrate=1;
$scope.showflatrate = false;
$scope.rosen1preistag="kostenlos - Flaterate";
$scope.rosen3preistag="kostenlos - Flaterate";
$scope.rosen9preistag="kostenlos - Flaterate";
} }
/* /*

BIN
platforms/android/build/intermediates/gradle_project_sync_data.bin
View File

Binary file not shown.

BIN
platforms/android/build/intermediates/res/resources-debug.ap_
View File

Binary file not shown.

BIN
platforms/android/build/intermediates/res/resources-release.ap_
View File

Binary file not shown.

BIN
platforms/android/build/outputs/apk/android-debug-unaligned.apk
View File

Binary file not shown.

BIN
platforms/android/build/outputs/apk/android-debug.apk
View File

Binary file not shown.

BIN
platforms/android/build/outputs/apk/android-release-unaligned.apk
View File

Binary file not shown.

2
platforms/android/build/outputs/lint-results-release-fatal.html
View File

@ -18,7 +18,7 @@ document.getElementById(id+'Link').style.display = 'none';
<body> <body>
<h1>Lint Report</h1> <h1>Lint Report</h1>
<div class="titleSeparator"></div> <div class="titleSeparator"></div>
Check performed at Tue Feb 02 15:54:13 CET 2016.<br/> Check performed at Tue Feb 02 16:22:42 CET 2016.<br/>
6 errors and 0 warnings found:<br/><br/> 6 errors and 0 warnings found:<br/><br/>
<table class="overview"> <table class="overview">
<tr><td></td><td class="categoryColumn"><a href="#Correctness">Correctness</a> <tr><td></td><td class="categoryColumn"><a href="#Correctness">Correctness</a>

1
www/js/app.js
View File

@ -17,6 +17,7 @@ angular.module('starter', ['ionic', 'ngCordova', 'starter.controllers', 'starter
$rootScope.storeinit=99; $rootScope.storeinit=99;
$rootScope.flatrate=0;
$ionicPlatform.registerBackButtonAction(function(event) { $ionicPlatform.registerBackButtonAction(function(event) {

30
www/js/controllers.js
View File

@ -145,8 +145,15 @@ $scope.show = function() {
if((window.device && device.platform == "Android") && typeof inappbilling !== "undefined") { if((window.device && device.platform == "Android") && typeof inappbilling !== "undefined") {
if ($rootScope.storeinit==1){ if ($rootScope.storeinit==1 && $rootScope.flatrate==0){
inappbilling.buy(successBuyHandler, errorBuyHandler, $scope.preis);
if ($scope.preis=='rosenflatrate'){
inappbilling.buy(successBuyOnceHandler, errorBuyHandler, $scope.preis);
}
else{
inappbilling.buy(successBuyHandler, errorBuyHandler, $scope.preis);
}
} }
else{ else{
var alertPopup = $ionicPopup.alert({ var alertPopup = $ionicPopup.alert({
@ -198,7 +205,26 @@ $scope.show = function() {
function successBuyHandler (result) { function successBuyHandler (result) {
if ($rootScope.flatrate==1){
//Kein Konsum auslösem direkt zum Download
$timeout(successConsumeHandler, 200);
}
else{
//Kein Konsum auslösem
$timeout(consumesuccessHandler, 500); $timeout(consumesuccessHandler, 500);
}
}
function successBuyOnceHandler (result) {
$rootScope.flatrate=1;
$scope.showflatrate = false;
$scope.rosen1preistag="kostenlos - Flaterate";
$scope.rosen3preistag="kostenlos - Flaterate";
$scope.rosen9preistag="kostenlos - Flaterate";
} }
/* /*