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

Kaufbutton Beschriftung geändert bei Flatrate

Browse Source
This commit is contained in:
Carsten Hilmer 2016-02-04 22:49:17 +01:00
parent 887388022b
commit 5c3c9b112f
22 changed files with 30 additions and 14 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.

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

@ -42,9 +42,11 @@
<file leaf-file-name="InAppBrowser.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/org/apache/cordova/inappbrowser/InAppBrowser.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.28506097">
<caret line="11" column="65" selection-start-line="11" selection-start-column="65" selection-end-line="11" selection-end-column="65" />
<folding />
<state vertical-scroll-proportion="0.8292683">
<caret line="80" column="50" selection-start-line="80" selection-start-column="50" selection-end-line="80" selection-end-column="50" />
<folding>
<element signature="e#0#38645#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -1231,7 +1233,7 @@
</option>
<option name="modificationStamps">
<map>
<entry key="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android" value="5818472615662" />
<entry key="C:\Ionic\Ionic\git2\wolle-rosen-kaufen\platforms\android" value="5818475242030" />
</map>
</option>
<option name="projectBuildClasspath">
@ -1871,9 +1873,11 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/org/apache/cordova/inappbrowser/InAppBrowser.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.28506097">
<caret line="11" column="65" selection-start-line="11" selection-start-column="65" selection-end-line="11" selection-end-column="65" />
<folding />
<state vertical-scroll-proportion="0.8292683">
<caret line="80" column="50" selection-start-line="80" selection-start-column="50" selection-end-line="80" selection-end-column="50" />
<folding>
<element signature="e#0#38645#0" expanded="true" />
</folding>
</state>
</provider>
</entry>

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

Binary file not shown.

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

@ -7,6 +7,7 @@ angular.module('starter.controllers', [])
$scope.freitext="";
$scope.items=[];
$scope.item=[];
$scope.kaufbutton='Jetzt Kaufen';
$scope.backgroundpic = "1";
@ -205,6 +206,7 @@ $scope.show = function() {
$scope.rosen1preistag="kostenlos - Flatrate";
$scope.rosen3preistag="kostenlos - Flatrate";
$scope.rosen9preistag="kostenlos - Flatrate";
$scope.kaufbutton='kostenlos laden';
}
@ -334,6 +336,7 @@ $scope.show = function() {
$scope.rosen1preistag="kostenlos - Flatrate";
$scope.rosen3preistag="kostenlos - Flatrate";
$scope.rosen9preistag="kostenlos - Flatrate";
$scope.kaufbutton='kostenlos laden';
$timeout(getProducts, 300);

2
platforms/android/assets/www/templates/tab-dash.html
View File

@ -64,7 +64,7 @@
<div class="row">
<div class="col col-50"><button class="button button-full button-small icon-left ion-image button-custom" 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="buyRose()">Jetzt Kaufen</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="buyRose()">{{kaufbutton}}</button></div>
</div>
<div class="row">

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

@ -7,6 +7,7 @@ angular.module('starter.controllers', [])
$scope.freitext="";
$scope.items=[];
$scope.item=[];
$scope.kaufbutton='Jetzt Kaufen';
$scope.backgroundpic = "1";
@ -205,6 +206,7 @@ $scope.show = function() {
$scope.rosen1preistag="kostenlos - Flatrate";
$scope.rosen3preistag="kostenlos - Flatrate";
$scope.rosen9preistag="kostenlos - Flatrate";
$scope.kaufbutton='kostenlos laden';
}
@ -334,6 +336,7 @@ $scope.show = function() {
$scope.rosen1preistag="kostenlos - Flatrate";
$scope.rosen3preistag="kostenlos - Flatrate";
$scope.rosen9preistag="kostenlos - Flatrate";
$scope.kaufbutton='kostenlos laden';
$timeout(getProducts, 300);

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

@ -64,7 +64,7 @@
<div class="row">
<div class="col col-50"><button class="button button-full button-small icon-left ion-image button-custom" 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="buyRose()">Jetzt Kaufen</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="buyRose()">{{kaufbutton}}</button></div>
</div>
<div class="row">

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

@ -7,6 +7,7 @@ angular.module('starter.controllers', [])
$scope.freitext="";
$scope.items=[];
$scope.item=[];
$scope.kaufbutton='Jetzt Kaufen';
$scope.backgroundpic = "1";
@ -205,6 +206,7 @@ $scope.show = function() {
$scope.rosen1preistag="kostenlos - Flatrate";
$scope.rosen3preistag="kostenlos - Flatrate";
$scope.rosen9preistag="kostenlos - Flatrate";
$scope.kaufbutton='kostenlos laden';
}
@ -334,6 +336,7 @@ $scope.show = function() {
$scope.rosen1preistag="kostenlos - Flatrate";
$scope.rosen3preistag="kostenlos - Flatrate";
$scope.rosen9preistag="kostenlos - Flatrate";
$scope.kaufbutton='kostenlos laden';
$timeout(getProducts, 300);

2
platforms/android/build/intermediates/assets/release/www/templates/tab-dash.html
View File

@ -64,7 +64,7 @@
<div class="row">
<div class="col col-50"><button class="button button-full button-small icon-left ion-image button-custom" 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="buyRose()">Jetzt Kaufen</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="buyRose()">{{kaufbutton}}</button></div>
</div>
<div class="row">

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>
<h1>Lint Report</h1>
<div class="titleSeparator"></div>
Check performed at Thu Feb 04 22:24:30 CET 2016.<br/>
Check performed at Thu Feb 04 22:43:51 CET 2016.<br/>
6 errors and 0 warnings found:<br/><br/>
<table class="overview">
<tr><td></td><td class="categoryColumn"><a href="#Correctness">Correctness</a>

2
platforms/android/local.properties
View File

@ -7,5 +7,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Thu Feb 04 22:23:56 CET 2016
#Thu Feb 04 22:43:21 CET 2016
sdk.dir=C\:\\Program Files (x86)\\Android\\android-sdk

3
www/js/controllers.js
View File

@ -7,6 +7,7 @@ angular.module('starter.controllers', [])
$scope.freitext="";
$scope.items=[];
$scope.item=[];
$scope.kaufbutton='Jetzt Kaufen';
$scope.backgroundpic = "1";
@ -205,6 +206,7 @@ $scope.show = function() {
$scope.rosen1preistag="kostenlos - Flatrate";
$scope.rosen3preistag="kostenlos - Flatrate";
$scope.rosen9preistag="kostenlos - Flatrate";
$scope.kaufbutton='kostenlos laden';
}
@ -334,6 +336,7 @@ $scope.show = function() {
$scope.rosen1preistag="kostenlos - Flatrate";
$scope.rosen3preistag="kostenlos - Flatrate";
$scope.rosen9preistag="kostenlos - Flatrate";
$scope.kaufbutton='kostenlos laden';
$timeout(getProducts, 300);

4
www/templates/tab-dash.html
View File

@ -63,8 +63,8 @@
<div class="item item-divider oleo">Rosen jetzt kaufen?</div>
<div class="row">
<div class="col col-50"><button class="button button-full button-small icon-left ion-image button-custom" 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="buyRose()">Jetzt Kaufen</button></div>
<div class="col col-50"><button class="button button-full button-small icon-left ion-image button-custom" 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="buyRose()">{{kaufbutton}}</button></div>
</div>
<div class="row">