"language-xml">+ <plugin name="cordova-plugin-device" spec="2.0.2" /> 100
+    <plugin name="cordova-plugin-splashscreen" spec="5.0.2" />
101
+    <plugin name="cordova-plugin-ionic-webview" spec="^5.0.0" />
102
+    <plugin name="cordova-plugin-ionic-keyboard" spec="^2.0.5" />
103
+</widget>

+ 4 - 1
ionic.config.json

@@ -1,7 +1,10 @@
1 1
 {
2 2
   "name": "farmr3",
3 3
   "integrations": {
4
-    "capacitor": {}
4
+    "capacitor": {
5
+      "enabled": false
6
+    },
7
+    "cordova": {}
5 8
   },
6 9
   "type": "angular"
7 10
 }

Файловите разлики са ограничени, защото са твърде много
+ 1698 - 17353
package-lock.json


+ 97 - 2
package.json

@@ -19,13 +19,43 @@
19 19
     "@angular/platform-browser": "~13.2.2",
20 20
     "@angular/platform-browser-dynamic": "~13.2.2",
21 21
     "@angular/router": "~13.2.2",
22
+    "@awesome-cordova-plugins/barcode-scanner": "^5.37.1",
23
+    "@awesome-cordova-plugins/core": "^5.37.1",
24
+    "@awesome-cordova-plugins/file-transfer": "^5.37.1",
25
+    "@awesome-cordova-plugins/native-geocoder": "^5.41.0",
26
+    "@awesome-cordova-plugins/push": "^5.37.1",
27
+    "@awesome-cordova-plugins/status-bar": "^5.37.2",
28
+    "@awesome-cordova-plugins/stripe": "^5.37.1",
22 29
     "@capacitor/app": "1.1.1",
23 30
     "@capacitor/core": "3.5.0",
24 31
     "@capacitor/haptics": "1.1.4",
32
+    "@capacitor/ios": "3.5.0",
25 33
     "@capacitor/keyboard": "1.2.2",
26 34
     "@capacitor/status-bar": "1.0.8",
35
+    "@fortawesome/angular-fontawesome": "^0.10.1",
36
+    "@fortawesome/fontawesome-free": "^5.15.4",
37
+    "@fortawesome/fontawesome-svg-core": "^1.2.36",
38
+    "@fortawesome/free-brands-svg-icons": "^5.15.4",
39
+    "@fortawesome/free-regular-svg-icons": "^5.15.4",
40
+    "@fortawesome/free-solid-svg-icons": "^5.15.4",
41
+    "@ionic-native/android-permissions": "^5.30.0",
42
+    "@ionic-native/call-number": "^5.36.0",
43
+    "@ionic-native/core": "^5.36.0",
44
+    "@ionic-native/device": "^5.30.0",
45
+    "@ionic-native/email-composer": "^5.36.0",
46
+    "@ionic-native/facebook": "^5.36.0",
47
+    "@ionic-native/geolocation": "^5.36.0",
48
+    "@ionic-native/http": "^5.36.0",
49
+    "@ionic-native/in-app-browser": "^5.36.0",
50
+    "@ionic-native/native-geocoder": "^5.36.0",
51
+    "@ionic-native/paypal": "^5.30.0",
52
+    "@ionic-native/push": "^5.36.0",
53
+    "@ionic-native/sign-in-with-apple": "^5.36.0",
54
+    "@ionic-native/uid": "^5.30.0",
27 55
     "@ionic/angular": "^6.0.0",
56
+    "@ionic/cordova-builders": "^6.1.0",
28 57
     "rxjs": "~6.6.0",
58
+    "sharp": "^0.30.4",
29 59
     "tslib": "^2.2.0",
30 60
     "zone.js": "~0.11.4"
31 61
   },
@@ -41,11 +71,36 @@
41 71
     "@angular/language-service": "~13.2.2",
42 72
     "@capacitor/cli": "3.5.0",
43 73
     "@ionic/angular-toolkit": "^6.0.0",
74
+    "@ionic/storage-angular": "^3.0.6",
44 75
     "@types/jasmine": "~3.6.0",
45 76
     "@types/jasminewd2": "~2.0.3",
46 77
     "@types/node": "^12.11.1",
47 78
     "@typescript-eslint/eslint-plugin": "5.3.0",
48 79
     "@typescript-eslint/parser": "5.3.0",
80
+    "cordova-ios": "^6.2.0",
81
+    "cordova-plugin-add-swift-support": "^2.0.2",
82
+    "cordova-plugin-advanced-http": "^3.2.2",
83
+    "cordova-plugin-android-permissions": "^1.1.2",
84
+    "cordova-plugin-androidx": "^3.0.0",
85
+    "cordova-plugin-androidx-adapter": "^1.1.3",
86
+    "cordova-plugin-device": "2.0.2",
87
+    "cordova-plugin-email-composer": "^0.10.0",
88
+    "cordova-plugin-facebook-connect": "^3.2.0",
89
+    "cordova-plugin-file": "^6.0.2",
90
+    "cordova-plugin-file-transfer": "^1.7.1",
91
+    "cordova-plugin-geolocation": "^4.1.0",
92
+    "cordova-plugin-googlemaps": "^2.7.1",
93
+    "cordova-plugin-googlemaps-sdk": "github:mapsplugin/cordova-plugin-googlemaps-sdk",
94
+    "cordova-plugin-inappbrowser": "^5.0.0",
95
+    "cordova-plugin-ionic-keyboard": "^2.2.0",
96
+    "cordova-plugin-ionic-webview": "^5.0.0",
97
+    "cordova-plugin-nativegeocoder": "^3.4.1",
98
+    "cordova-plugin-sign-in-with-apple": "^0.1.2",
99
+    "cordova-plugin-splashscreen": "5.0.2",
100
+    "cordova-plugin-statusbar": "2.4.2",
101
+    "cordova-plugin-stripe": "^1.5.3",
102
+    "cordova-plugin-uid": "^1.3.0",
103
+    "cordova-support-google-services": "^1.4.1",
49 104
     "eslint": "^7.6.0",
50 105
     "eslint-plugin-import": "2.22.1",
51 106
     "eslint-plugin-jsdoc": "30.7.6",
@@ -58,9 +113,49 @@
58 113
     "karma-coverage-istanbul-reporter": "~3.0.2",
59 114
     "karma-jasmine": "~4.0.0",
60 115
     "karma-jasmine-html-reporter": "^1.5.0",
116
+    "mx.ferreyra.callnumber": "0.0.2",
61 117
     "protractor": "~7.0.0",
62 118
     "ts-node": "~8.3.0",
63 119
     "typescript": "~4.4.4"
64 120
   },
65
-  "description": "An Ionic project"
66
-}
121
+  "description": "An Ionic project",
122
+  "cordova": {
123
+    "plugins": {
124
+      "cordova-plugin-statusbar": {},
125
+      "cordova-plugin-device": {},
126
+      "cordova-plugin-splashscreen": {},
127
+      "cordova-plugin-ionic-webview": {},
128
+      "cordova-plugin-ionic-keyboard": {},
129
+      "cordova-plugin-geolocation": {},
130
+      "cordova-plugin-nativegeocoder": {
131
+        "LOCATION_WHEN_IN_USE_DESCRIPTION": "Use geocoder service"
132
+      },
133
+      "mx.ferreyra.callnumber": {},
134
+      "cordova-plugin-email-composer": {},
135
+      "call-number": {},
136
+      "cordova-plugin-inappbrowser": {},
137
+      "cordova-plugin-sign-in-with-apple": {},
138
+      "cordova-plugin-androidx": {},
139
+      "cordova-plugin-androidx-adapter": {},
140
+      "phonegap-plugin-push": {},
141
+      "cordova-plugin-file-transfer": {},
142
+      "cordova-plugin-stripe": {},
143
+      "com.paypal.cordova.mobilesdk": {},
144
+      "cordova-plugin-facebook-connect": {
145
+        "APP_ID": "4746807965342529",
146
+        "APP_NAME": "FarmSter",
147
+        "FACEBOOK_URL_SCHEME_SUFFIX": " ",
148
+        "OTHER_APP_SCHEMES": " ",
149
+        "FACEBOOK_AUTO_LOG_APP_EVENTS": "true",
150
+        "FACEBOOK_HYBRID_APP_EVENTS": "false",
151
+        "FACEBOOK_ADVERTISER_ID_COLLECTION": "true",
152
+        "FACEBOOK_ANDROID_SDK_VERSION": "11.3.0",
153
+        "FACEBOOK_IOS_SDK_VERSION": "11.1.0",
154
+        "FACEBOOK_BROWSER_SDK_VERSION": "v11.0"
155
+      }
156
+    },
157
+    "platforms": [
158
+      "ios"
159
+    ]
160
+  }
161
+}

+ 8 - 0
resources/README.md

@@ -0,0 +1,8 @@
1
+These are Cordova resources. You can replace icon.png and splash.png and run
2
+`ionic cordova resources` to generate custom icons and splash screens for your
3
+app. See `ionic cordova resources --help` for details.
4
+
5
+Cordova reference documentation:
6
+
7
+- Icons: https://cordova.apache.org/docs/en/latest/config_ref/images.html
8
+- Splash Screens: https://cordova.apache.org/docs/en/latest/reference/cordova-plugin-splashscreen/

BIN
resources/android/icon/drawable-hdpi-icon.png


BIN
resources/android/icon/drawable-ldpi-icon.png


BIN
resources/android/icon/drawable-mdpi-icon.png


BIN
resources/android/icon/drawable-xhdpi-icon.png


BIN
resources/android/icon/drawable-xxhdpi-icon.png


BIN
resources/android/icon/drawable-xxxhdpi-icon.png


BIN
resources/android/splash/drawable-land-hdpi-screen.png


BIN
resources/android/splash/drawable-land-ldpi-screen.png


BIN
resources/android/splash/drawable-land-mdpi-screen.png


BIN
resources/android/splash/drawable-land-xhdpi-screen.png


BIN
resources/android/splash/drawable-land-xxhdpi-screen.png


BIN
resources/android/splash/drawable-land-xxxhdpi-screen.png


BIN
resources/android/splash/drawable-port-hdpi-screen.png


BIN
resources/android/splash/drawable-port-ldpi-screen.png


BIN
resources/android/splash/drawable-port-mdpi-screen.png


BIN
resources/android/splash/drawable-port-xhdpi-screen.png


BIN
resources/android/splash/drawable-port-xxhdpi-screen.png


BIN
resources/android/splash/drawable-port-xxxhdpi-screen.png


+ 7 - 0
resources/android/xml/network_security_config.xml

@@ -0,0 +1,7 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<network-security-config>
3
+    <domain-config cleartextTrafficPermitted="true">
4
+        <domain includeSubdomains="true">localhost</domain>
5
+        <domain includeSubdomains="true">tamtime.iamarray.xyz</domain>
6
+    </domain-config>
7
+</network-security-config>

BIN
resources/icon.png


BIN
resources/ios/icon/icon-1024.png


BIN
resources/ios/icon/icon-108@2x.png


BIN
resources/ios/icon/icon-20.png


BIN
resources/ios/icon/icon-20@2x.png


BIN
resources/ios/icon/icon-20@3x.png


BIN
resources/ios/icon/icon-24@2x.png


BIN
resources/ios/icon/icon-27.5@2x.png


BIN
resources/ios/icon/icon-29.png


BIN
resources/ios/icon/icon-29@2x.png


BIN
resources/ios/icon/icon-29@3x.png


BIN
resources/ios/icon/icon-40.png


BIN
resources/ios/icon/icon-40@2x.png


BIN
resources/ios/icon/icon-40@3x.png


BIN
resources/ios/icon/icon-44@2x.png


BIN
resources/ios/icon/icon-50.png


BIN
resources/ios/icon/icon-50@2x.png


BIN
resources/ios/icon/icon-60.png


BIN
resources/ios/icon/icon-60@2x.png


BIN
resources/ios/icon/icon-60@3x.png


BIN
resources/ios/icon/icon-72.png


BIN
resources/ios/icon/icon-72@2x.png


BIN
resources/ios/icon/icon-76.png


BIN
resources/ios/icon/icon-76@2x.png


BIN
resources/ios/icon/icon-83.5@2x.png


BIN
resources/ios/icon/icon-86@2x.png


BIN
resources/ios/icon/icon-98@2x.png


BIN
resources/ios/icon/icon.png


BIN
resources/ios/icon/icon@2x.png


BIN
resources/ios/splash/Default-1792h~iphone.png


BIN
resources/ios/splash/Default-2436h.png


BIN
resources/ios/splash/Default-2688h~iphone.png


BIN
resources/ios/splash/Default-568h@2x~iphone.png


BIN
resources/ios/splash/Default-667h.png


BIN
resources/ios/splash/Default-736h.png


BIN
resources/ios/splash/Default-Landscape-1792h~iphone.png


BIN
resources/ios/splash/Default-Landscape-2436h.png


BIN
resources/ios/splash/Default-Landscape-2688h~iphone.png


BIN
resources/ios/splash/Default-Landscape-736h.png


BIN
resources/ios/splash/Default-Landscape@2x~ipad.png


BIN
resources/ios/splash/Default-Landscape@~ipadpro.png


BIN
resources/ios/splash/Default-Landscape~ipad.png


BIN
resources/ios/splash/Default-Portrait@2x~ipad.png


BIN
resources/ios/splash/Default-Portrait@~ipadpro.png


BIN
resources/ios/splash/Default-Portrait~ipad.png


BIN
resources/ios/splash/Default@2x~iphone.png


BIN
resources/ios/splash/Default@2x~universal~anyany.png


BIN
resources/ios/splash/Default~iphone.png


BIN
resources/splash.png


+ 76 - 0
src/app/app-routing.module.ts

@@ -5,6 +5,82 @@ const routes: Routes = [
5 5
   {
6 6
     path: '',
7 7
     loadChildren: () => import('./tabs/tabs.module').then(m => m.TabsPageModule)
8
+  },
9
+  {
10
+    path: 'home',
11
+    loadChildren: () => import('./home/home.module').then( m => m.HomePageModule)
12
+  },
13
+  {
14
+    path: 'register',
15
+    loadChildren: () => import('./register/register.module').then( m => m.RegisterPageModule)
16
+  },
17
+  {
18
+    path: 'login',
19
+    loadChildren: () => import('./login/login.module').then( m => m.LoginPageModule)
20
+  },
21
+  {
22
+    path: 'forgot-password',
23
+    loadChildren: () => import('./forgot-password/forgot-password.module').then( m => m.ForgotPasswordPageModule)
24
+  },
25
+  {
26
+    path: 'register-form',
27
+    loadChildren: () => import('./register-form/register-form.module').then( m => m.RegisterFormPageModule)
28
+  },
29
+  {
30
+    path: 'profile',
31
+    loadChildren: () => import('./profile/profile.module').then( m => m.ProfilePageModule)
32
+  },
33
+  {
34
+    path: 'reset-password',
35
+    loadChildren: () => import('./reset-password/reset-password.module').then( m => m.ResetPasswordPageModule)
36
+  },
37
+  {
38
+    path: 'placedetail',
39
+    loadChildren: () => import('./placedetail/placedetail.module').then( m => m.PlacedetailPageModule)
40
+  },
41
+  {
42
+    path: 'place',
43
+    loadChildren: () => import('./place/place.module').then( m => m.PlacePageModule)
44
+  },
45
+  {
46
+    path: 'province',
47
+    loadChildren: () => import('./province/province.module').then( m => m.ProvincePageModule)
48
+  },
49
+  {
50
+    path: 'gmap',
51
+    loadChildren: () => import('./gmap/gmap.module').then( m => m.GmapPageModule)
52
+  },
53
+  {
54
+    path: 'nearme',
55
+    loadChildren: () => import('./nearme/nearme.module').then( m => m.NearmePageModule)
56
+  },
57
+  {
58
+    path: 'sample',
59
+    loadChildren: () => import('./sample/sample.module').then( m => m.SamplePageModule)
60
+  },
61
+  {
62
+    path: 'product',
63
+    loadChildren: () => import('./product/product.module').then( m => m.ProductPageModule)
64
+  },
65
+  {
66
+    path: 'product-detail',
67
+    loadChildren: () => import('./product-detail/product-detail.module').then( m => m.ProductDetailPageModule)
68
+  },
69
+  {
70
+    path: 'tracking',
71
+    loadChildren: () => import('./tracking/tracking.module').then( m => m.TrackingPageModule)
72
+  },
73
+  {
74
+    path: 'news',
75
+    loadChildren: () => import('./news/news.module').then( m => m.NewsPageModule)
76
+  },
77
+  {
78
+    path: 'checkout',
79
+    loadChildren: () => import('./checkout/checkout.module').then( m => m.CheckoutPageModule)
80
+  },
81
+  {
82
+    path: 'pay',
83
+    loadChildren: () => import('./pay/pay.module').then( m => m.PayPageModule)
8 84
   }
9 85
 ];
10 86
 @NgModule({

+ 4 - 0
src/app/app.component.scss

@@ -0,0 +1,4 @@
1
+.product-title {
2
+    font-weight:bold;
3
+    font-size:20px;
4
+}

+ 43 - 1
src/app/app.component.ts

@@ -1,4 +1,9 @@
1 1
 import { Component } from '@angular/core';
2
+import { Storage } from '@ionic/storage-angular';
3
+import { StatusBar } from '@awesome-cordova-plugins/status-bar/ngx';
4
+import { Uid } from '@ionic-native/uid/ngx';
5
+import { AndroidPermissions } from '@ionic-native/android-permissions/ngx';
6
+
2 7
 
3 8
 @Component({
4 9
   selector: 'app-root',
@@ -6,5 +11,42 @@ import { Component } from '@angular/core';
6 11
   styleUrls: ['app.component.scss'],
7 12
 })
8 13
 export class AppComponent {
9
-  constructor() {}
14
+    constructor(private storage: Storage, private statusBar:StatusBar, private uid: Uid, private androidPermissions: AndroidPermissions) {
15
+
16
+        this.statusBar.overlaysWebView(true);
17
+
18
+
19
+    }
20
+    openQRCode() {
21
+        console.log("open QR Code");
22
+    }
23
+    async ngOnInit() {
24
+        // If using a custom driver:
25
+        // await this.storage.defineDriver(MyCustomDriver)
26
+        await this.storage.create();
27
+        //await this.getImei();
28
+    }
29
+    async getImei() {
30
+        const { hasPermission } = await this.androidPermissions.checkPermission(
31
+            this.androidPermissions.PERMISSION.READ_PHONE_STATE
32
+        );
33
+        console.log(hasPermission);
34
+
35
+        if (!hasPermission) {
36
+            const result = await this.androidPermissions.requestPermission(
37
+                this.androidPermissions.PERMISSION.READ_PHONE_STATE
38
+            );
39
+
40
+            if (!result.hasPermission) {
41
+                throw new Error('Permissions required');
42
+            }
43
+
44
+            // ok, a user gave us permission, we can get him identifiers after restart app
45
+            return;
46
+        }
47
+        console.log("UUID");
48
+        console.log(this.uid.UUID);
49
+        await this.storage.set('uid', this.uid.UUID);
50
+        return this.uid.IMEI
51
+    }
10 52
 }

+ 66 - 6
src/app/app.module.ts

@@ -7,11 +7,71 @@ import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
7 7
 import { AppRoutingModule } from './app-routing.module';
8 8
 import { AppComponent } from './app.component';
9 9
 
10
+import { HttpClientModule, HttpClient} from '@angular/common/http';
11
+
12
+// import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
13
+// import { library } from '@fortawesome/fontawesome-svg-core';
14
+import { FontAwesomeModule, FaIconLibrary } from '@fortawesome/angular-fontawesome';
15
+import { fas } from '@fortawesome/free-solid-svg-icons';
16
+import { far } from '@fortawesome/free-regular-svg-icons';
17
+import { fab } from '@fortawesome/free-brands-svg-icons';
18
+
19
+import { Geolocation } from '@ionic-native/geolocation/ngx';
20
+import { NativeGeocoder } from '@ionic-native/native-geocoder/ngx';
21
+
22
+import { CallNumber } from '@ionic-native/call-number/ngx';
23
+import { EmailComposer } from '@ionic-native/email-composer/ngx';
24
+import { HTTP } from '@ionic-native/http/ngx';
25
+import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
26
+
27
+import { IonicStorageModule } from '@ionic/storage-angular';
28
+import { SignInWithApple } from '@ionic-native/sign-in-with-apple/ngx';
29
+
30
+import { PipeModule } from './pipe/pipe.module';
31
+import { Facebook } from '@ionic-native/facebook/ngx';
32
+
33
+import { BarcodeScanner } from '@awesome-cordova-plugins/barcode-scanner/ngx';
34
+import { PayPal } from '@ionic-native/paypal/ngx';
35
+import { StatusBar } from '@awesome-cordova-plugins/status-bar/ngx';
36
+import { Uid } from '@ionic-native/uid/ngx';
37
+import { AndroidPermissions } from '@ionic-native/android-permissions/ngx';
38
+import { Device } from '@ionic-native/device/ngx';
39
+
40
+//import { Stripe } from '@awesome-cordova-plugins/stripe/ngx';
41
+
42
+
43
+// import { IonicImageViewerModule } from 'ionic-img-viewer';
44
+
45
+
46
+// library.add(fas,far,fab);
47
+
10 48
 @NgModule({
11
-  declarations: [AppComponent],
12
-  entryComponents: [],
13
-  imports: [BrowserModule, IonicModule.forRoot(), AppRoutingModule],
14
-  providers: [{ provide: RouteReuseStrategy, useClass: IonicRouteStrategy }],
15
-  bootstrap: [AppComponent],
49
+    declarations: [AppComponent],
50
+    entryComponents: [],
51
+    imports: [HttpClientModule, BrowserModule, PipeModule,IonicModule.forRoot({_forceStatusbarPadding: true}), AppRoutingModule, FontAwesomeModule,   IonicStorageModule.forRoot()],
52
+    providers: [
53
+        Geolocation,
54
+        NativeGeocoder,
55
+        CallNumber,
56
+        EmailComposer,
57
+        InAppBrowser,
58
+        HTTP,
59
+        Facebook, 
60
+        StatusBar,
61
+        BarcodeScanner,
62
+        SignInWithApple,
63
+        PayPal,
64
+        AndroidPermissions,
65
+        Uid,
66
+        Device,
67
+        //Stripe,
68
+        { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }
69
+    ],
70
+    bootstrap: [AppComponent],
16 71
 })
17
-export class AppModule {}
72
+export class AppModule {
73
+    constructor(library: FaIconLibrary) {
74
+        library.addIconPacks(fas, fab, far);
75
+    }
76
+
77
+}

+ 17 - 0
src/app/checkout/checkout-routing.module.ts

@@ -0,0 +1,17 @@
1
+import { NgModule } from '@angular/core';
2
+import { Routes, RouterModule } from '@angular/router';
3
+
4
+import { CheckoutPage } from './checkout.page';
5
+
6
+const routes: Routes = [
7
+  {
8
+    path: '',
9
+    component: CheckoutPage
10
+  }
11
+];
12
+
13
+@NgModule({
14
+  imports: [RouterModule.forChild(routes)],
15
+  exports: [RouterModule],
16
+})
17
+export class CheckoutPageRoutingModule {}

+ 20 - 0
src/app/checkout/checkout.module.ts

@@ -0,0 +1,20 @@
1
+import { NgModule } from '@angular/core';
2
+import { CommonModule } from '@angular/common';
3
+import { FormsModule } from '@angular/forms';
4
+
5
+import { IonicModule } from '@ionic/angular';
6
+
7
+import { CheckoutPageRoutingModule } from './checkout-routing.module';
8
+
9
+import { CheckoutPage } from './checkout.page';
10
+
11
+@NgModule({
12
+  imports: [
13
+    CommonModule,
14
+    FormsModule,
15
+    IonicModule,
16
+    CheckoutPageRoutingModule
17
+  ],
18
+  declarations: [CheckoutPage]
19
+})
20
+export class CheckoutPageModule {}

+ 81 - 0
src/app/checkout/checkout.page.html

@@ -0,0 +1,81 @@
1
+<ion-header>
2
+  <ion-toolbar class='new-background-color'>
3
+    <ion-title>Checkout</ion-title>
4
+      <ion-buttons slot="end">
5
+          <ion-button (click)="dismiss()" color="light">
6
+            <ion-icon name="close-circle-outline"></ion-icon>
7
+          </ion-button>
8
+      </ion-buttons>
9
+  </ion-toolbar>
10
+</ion-header>
11
+
12
+<ion-content>
13
+    <ion-list>
14
+        <ion-list-header>
15
+            Recent Items
16
+        </ion-list-header>
17
+
18
+        <ion-item-sliding>
19
+            <ion-item>
20
+            <ion-avatar slot="start">
21
+                <img src="assets/images/fresh-durian.jpeg">
22
+            </ion-avatar>
23
+            <ion-label>
24
+                <h2>Durian</h2>
25
+                <p>Size M</p>
26
+            </ion-label>
27
+            <ion-label slot='end'>
28
+                3 * 100.00 = 
29
+            </ion-label>
30
+            <ion-label slot='end'>
31
+                300.00 THB
32
+            </ion-label>
33
+            </ion-item>
34
+            <ion-item-options side="end">
35
+                <ion-item-option (click)="unread(item)" color='danger'>Remove</ion-item-option>
36
+            </ion-item-options>
37
+        </ion-item-sliding>
38
+        <ion-item>
39
+            <ion-avatar slot="start">
40
+                <img src="assets/images/fresh-durian.jpeg">
41
+            </ion-avatar>
42
+            <ion-label>
43
+                <h2>Durian</h2>
44
+                <p>Size M</p>
45
+            </ion-label>
46
+            <ion-label slot='end'>
47
+                3 * 100 = 
48
+            </ion-label>
49
+            <ion-label slot='end'>
50
+                300.00 THB
51
+            </ion-label>
52
+        </ion-item>
53
+        <ion-item>
54
+            <ion-label slot="end">
55
+                <h2>Sub Total = </h2>
56
+            </ion-label>
57
+            <ion-label slot='end'>
58
+               600.00 THB
59
+            </ion-label>
60
+        </ion-item>
61
+        <ion-item>
62
+            <ion-label slot="end">
63
+                <h2>Vat 7%  = </h2>
64
+            </ion-label>
65
+            <ion-label slot='end'>
66
+               42.00 THB
67
+            </ion-label>
68
+        </ion-item>
69
+        <ion-item>
70
+            <ion-label slot="end">
71
+                <h2>Total = </h2>
72
+            </ion-label>
73
+            <ion-label slot='end'>
74
+               642.00 THB
75
+            </ion-label>
76
+        </ion-item>
77
+    </ion-list>
78
+    <ion-button expand="full" color="success" (click)="payWithPaypal()">Pay with PayPal</ion-button>
79
+
80
+
81
+</ion-content>

+ 0 - 0
src/app/checkout/checkout.page.scss


+ 24 - 0
src/app/checkout/checkout.page.spec.ts

@@ -0,0 +1,24 @@
1
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
2
+import { IonicModule } from '@ionic/angular';
3
+
4
+import { CheckoutPage } from './checkout.page';
5
+
6
+describe('CheckoutPage', () => {
7
+  let component: CheckoutPage;
8
+  let fixture: ComponentFixture<CheckoutPage>;
9
+
10
+  beforeEach(waitForAsync(() => {
11
+    TestBed.configureTestingModule({
12
+      declarations: [ CheckoutPage ],
13
+      imports: [IonicModule.forRoot()]
14
+    }).compileComponents();
15
+
16
+    fixture = TestBed.createComponent(CheckoutPage);
17
+    component = fixture.componentInstance;
18
+    fixture.detectChanges();
19
+  }));
20
+
21
+  it('should create', () => {
22
+    expect(component).toBeTruthy();
23
+  });
24
+});

+ 56 - 0
src/app/checkout/checkout.page.ts

@@ -0,0 +1,56 @@
1
+import { Component, OnInit } from '@angular/core';
2
+import { ModalController, Platform } from '@ionic/angular';
3
+import { PayPal, PayPalPayment, PayPalConfiguration } from '@ionic-native/paypal/ngx';
4
+
5
+@Component({
6
+    selector: 'app-checkout',
7
+    templateUrl: './checkout.page.html',
8
+    styleUrls: ['./checkout.page.scss'],
9
+})
10
+export class CheckoutPage implements OnInit {
11
+
12
+    constructor(public modalController: ModalController, private payPal: PayPal) { }
13
+
14
+    ngOnInit() {
15
+    }
16
+
17
+    dismiss() {
18
+        // using the injected ModalController this page
19
+        // can "dismiss" itself and optionally pass back data
20
+        this.modalController.dismiss({
21
+            'dismissed': true
22
+        });
23
+    }
24
+
25
+    paymentAmount: string = '640';
26
+    currency: string = 'USD';
27
+    currencyIcon: string = 'USD';
28
+
29
+    payWithPaypal() {
30
+        this.payPal.init({
31
+            PayPalEnvironmentProduction: 'YOUR_PRODUCTION_CLIENT_ID',
32
+            PayPalEnvironmentSandbox: 'AVszPxWCuK3FGXKlgOCFu3gVXr8lFkKj9z1wUo9BYdestZbGRg5vDqWm_pqlLkhEu8KHsjP8NmfPhc_o'
33
+        }).then(() => {
34
+            // Environments: PayPalEnvironmentNoNetwork, PayPalEnvironmentSandbox, PayPalEnvironmentProduction
35
+            this.payPal.prepareToRender('PayPalEnvironmentSandbox', new PayPalConfiguration({
36
+                // Only needed if you get an "Internal Service Error" after PayPal login!
37
+                //payPalShippingAddressOption: 2 // PayPalShippingAddressOptionPayPal
38
+            })).then(() => {
39
+                let payment = new PayPalPayment(this.paymentAmount, this.currency, 'Description', 'sale');
40
+                this.payPal.renderSinglePaymentUI(payment).then((res) => {
41
+                    console.log(res);
42
+                    // Successfully paid
43
+                }, (error) => {
44
+                    console.log(error);
45
+                    // Error or render dialog closed without being successful
46
+                });
47
+            }, (error) => {
48
+                console.log(error);
49
+                // Error in configuration
50
+            });
51
+        }, (error) => {
52
+            console.log(error);
53
+            // Error in initialization, maybe PayPal isn't supported or something else
54
+        });
55
+    }
56
+}

+ 3 - 1
src/app/explore-container/explore-container.component.html

@@ -1,4 +1,6 @@
1 1
 <div id="container">
2 2
   <strong>{{ name }}</strong>
3 3
   <p>Explore <a target="_blank" rel="noopener noreferrer" href="https://ionicframework.com/docs/components">UI Components</a></p>
4
-</div>
4
+</div>
5
+<ion-title size="large">wellnessroute.info</ion-title>
6
+  <ion-title size="large">แผนที่สุขภาพ</ion-title>

+ 17 - 0
src/app/forgot-password/forgot-password-routing.module.ts

@@ -0,0 +1,17 @@
1
+import { NgModule } from '@angular/core';
2
+import { Routes, RouterModule } from '@angular/router';
3
+
4
+import { ForgotPasswordPage } from './forgot-password.page';
5
+
6
+const routes: Routes = [
7
+  {
8
+    path: '',
9
+    component: ForgotPasswordPage
10
+  }
11
+];
12
+
13
+@NgModule({
14
+  imports: [RouterModule.forChild(routes)],
15
+  exports: [RouterModule],
16
+})
17
+export class ForgotPasswordPageRoutingModule {}

+ 20 - 0
src/app/forgot-password/forgot-password.module.ts

@@ -0,0 +1,20 @@
1
+import { NgModule } from '@angular/core';
2
+import { CommonModule } from '@angular/common';
3
+import { FormsModule } from '@angular/forms';
4
+
5
+import { IonicModule } from '@ionic/angular';
6
+
7
+import { ForgotPasswordPageRoutingModule } from './forgot-password-routing.module';
8
+
9
+import { ForgotPasswordPage } from './forgot-password.page';
10
+
11
+@NgModule({
12
+  imports: [
13
+    CommonModule,
14
+    FormsModule,
15
+    IonicModule,
16
+    ForgotPasswordPageRoutingModule
17
+  ],
18
+  declarations: [ForgotPasswordPage]
19
+})
20
+export class ForgotPasswordPageModule {}

+ 37 - 0
src/app/forgot-password/forgot-password.page.html

@@ -0,0 +1,37 @@
1
+<ion-header>
2
+  <ion-toolbar class="new-background-color">
3
+    <ion-buttons slot="end">
4
+      <ion-button (click)="dismiss()" color="light">ปิด</ion-button>
5
+    </ion-buttons>
6
+    <div class="hcs">
7
+      <img src="/assets/images/wellnessbar.svg" height="50" />    
8
+    </div>
9
+  </ion-toolbar>
10
+</ion-header>
11
+<ion-content>
12
+  <div><img src="/assets/images/image-006.jpg"></div>
13
+  <ion-grid>
14
+    <ion-row>
15
+      <ion-col>
16
+        <div class="ion-text-center">
17
+          <h1>ลืมรหัสผ่าน</h1>
18
+        </div>
19
+      </ion-col>
20
+    </ion-row>
21
+    <form>
22
+      <ion-row>
23
+        <ion-col>
24
+          <ion-item lines="full">
25
+            <ion-label position="floating">อีเมล์</ion-label>
26
+            <ion-input type="email" name="email" [(ngModel)]="email" inputmode="email"></ion-input>
27
+          </ion-item>
28
+        </ion-col>
29
+      </ion-row>
30
+      <ion-row>
31
+        <ion-col>
32
+          <ion-button type="submit" color="danger" expand="block" (click)="resetPassword()">ส่งรหัสผ่าน</ion-button>
33
+        </ion-col>
34
+      </ion-row>
35
+    </form>
36
+  </ion-grid>
37
+</ion-content>

+ 0 - 0
src/app/forgot-password/forgot-password.page.scss


+ 24 - 0
src/app/forgot-password/forgot-password.page.spec.ts

@@ -0,0 +1,24 @@
1
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
2
+import { IonicModule } from '@ionic/angular';
3
+
4
+import { ForgotPasswordPage } from './forgot-password.page';
5
+
6
+describe('ForgotPasswordPage', () => {
7
+  let component: ForgotPasswordPage;
8
+  let fixture: ComponentFixture<ForgotPasswordPage>;
9
+
10
+  beforeEach(waitForAsync(() => {
11
+    TestBed.configureTestingModule({
12
+      declarations: [ ForgotPasswordPage ],
13
+      imports: [IonicModule.forRoot()]
14
+    }).compileComponents();
15
+
16
+    fixture = TestBed.createComponent(ForgotPasswordPage);
17
+    component = fixture.componentInstance;
18
+    fixture.detectChanges();
19
+  }));
20
+
21
+  it('should create', () => {
22
+    expect(component).toBeTruthy();
23
+  });
24
+});

+ 36 - 0
src/app/forgot-password/forgot-password.page.ts

@@ -0,0 +1,36 @@
1
+import { Component, OnInit } from '@angular/core';
2
+import { ModalController } from '@ionic/angular';
3
+import { WpServiceService } from '../wp-service.service';
4
+
5
+@Component({
6
+    selector: 'app-forgot-password',
7
+    templateUrl: './forgot-password.page.html',
8
+    styleUrls: ['./forgot-password.page.scss'],
9
+})
10
+export class ForgotPasswordPage implements OnInit {
11
+
12
+    email = "";
13
+
14
+    constructor(public modalController: ModalController, private wp:WpServiceService) { }
15
+
16
+    ngOnInit() {
17
+    }
18
+
19
+    async resetPassword() {
20
+        if( this.email == "" ) {
21
+            alert("Please Enter Valid Email");
22
+            return;
23
+        }
24
+        let r = await this.wp.resetPassword(this.email);
25
+        alert(r.msg);
26
+    }
27
+
28
+    dismiss() {
29
+        // using the injected ModalController this page
30
+        // can "dismiss" itself and optionally pass back data
31
+        this.modalController.dismiss({
32
+            'dismissed': true
33
+        });
34
+    }
35
+
36
+}

+ 17 - 0
src/app/gmap/gmap-routing.module.ts

@@ -0,0 +1,17 @@
1
+import { NgModule } from '@angular/core';
2
+import { Routes, RouterModule } from '@angular/router';
3
+
4
+import { GmapPage } from './gmap.page';
5
+
6
+const routes: Routes = [
7
+  {
8
+    path: '',
9
+    component: GmapPage
10
+  }
11
+];
12
+
13
+@NgModule({
14
+  imports: [RouterModule.forChild(routes)],
15
+  exports: [RouterModule],
16
+})
17
+export class GmapPageRoutingModule {}

+ 20 - 0
src/app/gmap/gmap.module.ts

@@ -0,0 +1,20 @@
1
+import { NgModule } from '@angular/core';
2
+import { CommonModule } from '@angular/common';
3
+import { FormsModule } from '@angular/forms';
4
+
5
+import { IonicModule } from '@ionic/angular';
6
+
7
+import { GmapPageRoutingModule } from './gmap-routing.module';
8
+
9
+import { GmapPage } from './gmap.page';
10
+
11
+@NgModule({
12
+  imports: [
13
+    CommonModule,
14
+    FormsModule,
15
+    IonicModule,
16
+    GmapPageRoutingModule
17
+  ],
18
+  declarations: [GmapPage]
19
+})
20
+export class GmapPageModule {}

+ 9 - 0
src/app/gmap/gmap.page.html

@@ -0,0 +1,9 @@
1
+<ion-header>
2
+  <ion-toolbar>
3
+    <ion-title>gmap</ion-title>
4
+  </ion-toolbar>
5
+</ion-header>
6
+
7
+<ion-content>..
8
+<div #map id="map"></div>
9
+</ion-content>

+ 3 - 0
src/app/gmap/gmap.page.scss

@@ -0,0 +1,3 @@
1
+#map {
2
+    height: 300px;
3
+}

+ 24 - 0
src/app/gmap/gmap.page.spec.ts

@@ -0,0 +1,24 @@
1
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
2
+import { IonicModule } from '@ionic/angular';
3
+
4
+import { GmapPage } from './gmap.page';
5
+
6
+describe('GmapPage', () => {
7
+  let component: GmapPage;
8
+  let fixture: ComponentFixture<GmapPage>;
9
+
10
+  beforeEach(waitForAsync(() => {
11
+    TestBed.configureTestingModule({
12
+      declarations: [ GmapPage ],
13
+      imports: [IonicModule.forRoot()]
14
+    }).compileComponents();
15
+
16
+    fixture = TestBed.createComponent(GmapPage);
17
+    component = fixture.componentInstance;
18
+    fixture.detectChanges();
19
+  }));
20
+
21
+  it('should create', () => {
22
+    expect(component).toBeTruthy();
23
+  });
24
+});

+ 72 - 0
src/app/gmap/gmap.page.ts

@@ -0,0 +1,72 @@
1
+import { Component, OnInit, Input, ViewChild, ElementRef } from '@angular/core';
2
+import { ActivatedRoute, Router } from '@angular/router';
3
+import { WpServiceService } from '../wp-service.service';
4
+import { Geolocation } from '@ionic-native/geolocation/ngx';
5
+import { NativeGeocoder, NativeGeocoderResult, NativeGeocoderOptions } from '@ionic-native/native-geocoder/ngx';
6
+
7
+declare var google: any;
8
+
9
+@Component({
10
+  selector: 'app-gmap',
11
+  templateUrl: './gmap.page.html',
12
+  styleUrls: ['./gmap.page.scss'],
13
+})
14
+export class GmapPage implements OnInit {
15
+  @Input() id: string;
16
+  data: any;
17
+  placelist: any;
18
+  latdynamic: any;
19
+  londynamic: any;
20
+  xxx: any;
21
+  yyy: any;
22
+  placeL: any;
23
+  map: any;
24
+  // @ViewChild('map', { static: false }) mapElement: ElementRef;
25
+  @ViewChild('map', { static: true }) mapRef: ElementRef;
26
+  // @ViewChild('map', { static: false }) mapElement: ElementRef;
27
+
28
+
29
+  constructor(private wpservice: WpServiceService, private route: ActivatedRoute, private router: Router, private geolocation: Geolocation) { }
30
+
31
+  ngOnInit() {
32
+    this.showMap();
33
+    // this.loadMap() 
34
+    let id = this.route.snapshot.paramMap.get('id') || this.id;
35
+    this.wpservice.getPlaceDetail(173).subscribe((data) => {
36
+      this.placelist = data;
37
+      this.latdynamic = data['acf']['gmap']['lat'];
38
+      this.londynamic = data['acf']['gmap']['lng'];
39
+
40
+      console.log("load Place Detail ...");
41
+      console.log(this.latdynamic);
42
+      console.log("load Lati ...");
43
+      console.log(this.londynamic);
44
+      console.log("load Lon ...");
45
+      console.log(data);
46
+      let xxx = this.londynamic;
47
+      const yyy = this.latdynamic;
48
+    }, error => {
49
+      console.log("errror ", error);
50
+    });
51
+
52
+    let watch = this.geolocation.watchPosition();
53
+    watch.subscribe((data) => {
54
+      // data can be a set of coordinates, or an error (if an error occurred).
55
+      // data.coords.latitude
56
+      // data.coords.longitude
57
+      console.log(data);
58
+    });
59
+  }
60
+
61
+  showMap() {
62
+    let location = new google.maps.LatLng(13.7643439, 100.6899729);
63
+    let options = {
64
+      center: location,
65
+      zoom: 15,
66
+      disableDefaultUI: true
67
+    }
68
+    this.map = new google.maps.Map(this.mapRef.nativeElement, options);
69
+    //this.map = new google.maps.Map(this.mapElement.nativeElement, mapOptions);
70
+  }
71
+
72
+}

+ 17 - 0
src/app/home/home-routing.module.ts

@@ -0,0 +1,17 @@
1
+import { NgModule } from '@angular/core';
2
+import { Routes, RouterModule } from '@angular/router';
3
+
4
+import { HomePage } from './home.page';
5
+
6
+const routes: Routes = [
7
+  {
8
+    path: '',
9
+    component: HomePage
10
+  }
11
+];
12
+
13
+@NgModule({
14
+  imports: [RouterModule.forChild(routes)],
15
+  exports: [RouterModule],
16
+})
17
+export class HomePageRoutingModule {}

+ 26 - 0
src/app/home/home.module.ts

@@ -0,0 +1,26 @@
1
+import { NgModule } from '@angular/core';
2
+import { CommonModule } from '@angular/common';
3
+import { FormsModule } from '@angular/forms';
4
+
5
+import { IonicModule } from '@ionic/angular';
6
+
7
+import { HomePageRoutingModule } from './home-routing.module';
8
+
9
+import { HomePage } from './home.page';
10
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
11
+import { IonSlides } from '@ionic/angular';
12
+
13
+import { PipeModule } from '../pipe/pipe.module';
14
+
15
+@NgModule({
16
+  imports: [
17
+    CommonModule,
18
+    FormsModule,
19
+    IonicModule,
20
+      PipeModule,
21
+    HomePageRoutingModule,
22
+    FontAwesomeModule
23
+  ],
24
+  declarations: [HomePage]
25
+})
26
+export class HomePageModule {}

+ 0 - 0
src/app/home/home.page.290921.html


Някои файлове не бяха показани, защото твърде много файлове са промени

tum/whitesports - Gogs: Simplico Git Service

No Description

class-theme-upgrader.php 24KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746
  1. <?php
  2. /**
  3. * Upgrade API: Theme_Upgrader class
  4. *
  5. * @package WordPress
  6. * @subpackage Upgrader
  7. * @since 4.6.0
  8. */
  9. /**
  10. * Core class used for upgrading/installing themes.
  11. *
  12. * It is designed to upgrade/install themes from a local zip, remote zip URL,
  13. * or uploaded zip file.
  14. *
  15. * @since 2.8.0
  16. * @since 4.6.0 Moved to its own file from wp-admin/includes/class-wp-upgrader.php.
  17. *
  18. * @see WP_Upgrader
  19. */
  20. class Theme_Upgrader extends WP_Upgrader {
  21. /**
  22. * Result of the theme upgrade offer.
  23. *
  24. * @since 2.8.0
  25. * @var array|WP_Error $result
  26. * @see WP_Upgrader::$result
  27. */
  28. public $result;
  29. /**
  30. * Whether multiple themes are being upgraded/installed in bulk.
  31. *
  32. * @since 2.9.0
  33. * @var bool $bulk
  34. */
  35. public $bulk = false;
  36. /**
  37. * New theme info.
  38. *
  39. * @since 5.5.0
  40. * @var array $new_theme_data
  41. *
  42. * @see check_package()
  43. */
  44. public $new_theme_data = array();
  45. /**
  46. * Initialize the upgrade strings.
  47. *
  48. * @since 2.8.0
  49. */
  50. public function upgrade_strings() {
  51. $this->strings['up_to_date'] = __( 'The theme is at the latest version.' );
  52. $this->strings['no_package'] = __( 'Update package not available.' );
  53. /* translators: %s: Package URL. */
  54. $this->strings['downloading_package'] = sprintf( __( 'Downloading update from %s&#8230;' ), '<span class="code">%s</span>' );
  55. $this->strings['unpack_package'] = __( 'Unpacking the update&#8230;' );
  56. $this->strings['remove_old'] = __( 'Removing the old version of the theme&#8230;' );
  57. $this->strings['remove_old_failed'] = __( 'Could not remove the old theme.' );
  58. $this->strings['process_failed'] = __( 'Theme update failed.' );
  59. $this->strings['process_success'] = __( 'Theme updated successfully.' );
  60. }
  61. /**
  62. * Initialize the installation strings.
  63. *
  64. * @since 2.8.0
  65. */
  66. public function install_strings() {
  67. $this->strings['no_package'] = __( 'Installation package not available.' );
  68. /* translators: %s: Package URL. */
  69. $this->strings['downloading_package'] = sprintf( __( 'Downloading installation package from %s&#8230;' ), '<span class="code">%s</span>' );
  70. $this->strings['unpack_package'] = __( 'Unpacking the package&#8230;' );
  71. $this->strings['installing_package'] = __( 'Installing the theme&#8230;' );
  72. $this->strings['remove_old'] = __( 'Removing the old version of the theme&#8230;' );
  73. $this->strings['remove_old_failed'] = __( 'Could not remove the old theme.' );
  74. $this->strings['no_files'] = __( 'The theme contains no files.' );
  75. $this->strings['process_failed'] = __( 'Theme installation failed.' );
  76. $this->strings['process_success'] = __( 'Theme installed successfully.' );
  77. /* translators: 1: Theme name, 2: Theme version. */
  78. $this->strings['process_success_specific'] = __( 'Successfully installed the theme <strong>%1$s %2$s</strong>.' );
  79. $this->strings['parent_theme_search'] = __( 'This theme requires a parent theme. Checking if it is installed&#8230;' );
  80. /* translators: 1: Theme name, 2: Theme version. */
  81. $this->strings['parent_theme_prepare_install'] = __( 'Preparing to install <strong>%1$s %2$s</strong>&#8230;' );
  82. /* translators: 1: Theme name, 2: Theme version. */
  83. $this->strings['parent_theme_currently_installed'] = __( 'The parent theme, <strong>%1$s %2$s</strong>, is currently installed.' );
  84. /* translators: 1: Theme name, 2: Theme version. */
  85. $this->strings['parent_theme_install_success'] = __( 'Successfully installed the parent theme, <strong>%1$s %2$s</strong>.' );
  86. /* translators: %s: Theme name. */
  87. $this->strings['parent_theme_not_found'] = sprintf( __( '<strong>The parent theme could not be found.</strong> You will need to install the parent theme, %s, before you can use this child theme.' ), '<strong>%s</strong>' );
  88. /* translators: %s: Theme error. */
  89. $this->strings['current_theme_has_errors'] = __( 'The current theme has the following error: "%s".' );
  90. if ( ! empty( $this->skin->overwrite ) ) {
  91. if ( 'update-theme' === $this->skin->overwrite ) {
  92. $this->strings['installing_package'] = __( 'Updating the theme&#8230;' );
  93. $this->strings['process_failed'] = __( 'Theme update failed.' );
  94. $this->strings['process_success'] = __( 'Theme updated successfully.' );
  95. }
  96. if ( 'downgrade-theme' === $this->skin->overwrite ) {
  97. $this->strings['installing_package'] = __( 'Downgrading the theme&#8230;' );
  98. $this->strings['process_failed'] = __( 'Theme downgrade failed.' );
  99. $this->strings['process_success'] = __( 'Theme downgraded successfully.' );
  100. }
  101. }
  102. }
  103. /**
  104. * Check if a child theme is being installed and we need to install its parent.
  105. *
  106. * Hooked to the {@see 'upgrader_post_install'} filter by Theme_Upgrader::install().
  107. *
  108. * @since 3.4.0
  109. *
  110. * @param bool $install_result
  111. * @param array $hook_extra
  112. * @param array $child_result
  113. * @return bool
  114. */
  115. public function check_parent_theme_filter( $install_result, $hook_extra, $child_result ) {
  116. // Check to see if we need to install a parent theme.
  117. $theme_info = $this->theme_info();
  118. if ( ! $theme_info->parent() ) {
  119. return $install_result;
  120. }
  121. $this->skin->feedback( 'parent_theme_search' );
  122. if ( ! $theme_info->parent()->errors() ) {
  123. $this->skin->feedback( 'parent_theme_currently_installed', $theme_info->parent()->display( 'Name' ), $theme_info->parent()->display( 'Version' ) );
  124. // We already have the theme, fall through.
  125. return $install_result;
  126. }
  127. // We don't have the parent theme, let's install it.
  128. $api = themes_api(
  129. 'theme_information',
  130. array(
  131. 'slug' => $theme_info->get( 'Template' ),
  132. 'fields' => array(
  133. 'sections' => false,
  134. 'tags' => false,
  135. ),
  136. )
  137. ); // Save on a bit of bandwidth.
  138. if ( ! $api || is_wp_error( $api ) ) {
  139. $this->skin->feedback( 'parent_theme_not_found', $theme_info->get( 'Template' ) );
  140. // Don't show activate or preview actions after installation.
  141. add_filter( 'install_theme_complete_actions', array( $this, 'hide_activate_preview_actions' ) );
  142. return $install_result;
  143. }
  144. // Backup required data we're going to override:
  145. $child_api = $this->skin->api;
  146. $child_success_message = $this->strings['process_success'];
  147. // Override them.
  148. $this->skin->api = $api;
  149. $this->strings['process_success_specific'] = $this->strings['parent_theme_install_success'];
  150. $this->skin->feedback( 'parent_theme_prepare_install', $api->name, $api->version );
  151. add_filter( 'install_theme_complete_actions', '__return_false', 999 ); // Don't show any actions after installing the theme.
  152. // Install the parent theme.
  153. $parent_result = $this->run(
  154. array(
  155. 'package' => $api->download_link,
  156. 'destination' => get_theme_root(),
  157. 'clear_destination' => false, // Do not overwrite files.
  158. 'clear_working' => true,
  159. )
  160. );
  161. if ( is_wp_error( $parent_result ) ) {
  162. add_filter( 'install_theme_complete_actions', array( $this, 'hide_activate_preview_actions' ) );
  163. }
  164. // Start cleaning up after the parent's installation.
  165. remove_filter( 'install_theme_complete_actions', '__return_false', 999 );
  166. // Reset child's result and data.
  167. $this->result = $child_result;
  168. $this->skin->api = $child_api;
  169. $this->strings['process_success'] = $child_success_message;
  170. return $install_result;
  171. }
  172. /**
  173. * Don't display the activate and preview actions to the user.
  174. *
  175. * Hooked to the {@see 'install_theme_complete_actions'} filter by
  176. * Theme_Upgrader::check_parent_theme_filter() when installing
  177. * a child theme and installing the parent theme fails.
  178. *
  179. * @since 3.4.0
  180. *
  181. * @param array $actions Preview actions.
  182. * @return array
  183. */
  184. public function hide_activate_preview_actions( $actions ) {
  185. unset( $actions['activate'], $actions['preview'] );
  186. return $actions;
  187. }
  188. /**
  189. * Install a theme package.
  190. *
  191. * @since 2.8.0
  192. * @since 3.7.0 The `$args` parameter was added, making clearing the update cache optional.
  193. *
  194. * @param string $package The full local path or URI of the package.
  195. * @param array $args {
  196. * Optional. Other arguments for installing a theme package. Default empty array.
  197. *
  198. * @type bool $clear_update_cache Whether to clear the updates cache if successful.
  199. * Default true.
  200. * }
  201. *
  202. * @return bool|WP_Error True if the installation was successful, false or a WP_Error object otherwise.
  203. */
  204. public function install( $package, $args = array() ) {
  205. $defaults = array(
  206. 'clear_update_cache' => true,
  207. 'overwrite_package' => false, // Do not overwrite files.
  208. );
  209. $parsed_args = wp_parse_args( $args, $defaults );
  210. $this->init();
  211. $this->install_strings();
  212. add_filter( 'upgrader_source_selection', array( $this, 'check_package' ) );
  213. add_filter( 'upgrader_post_install', array( $this, 'check_parent_theme_filter' ), 10, 3 );
  214. if ( $parsed_args['clear_update_cache'] ) {
  215. // Clear cache so wp_update_themes() knows about the new theme.
  216. add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 );
  217. }
  218. $this->run(
  219. array(
  220. 'package' => $package,
  221. 'destination' => get_theme_root(),
  222. 'clear_destination' => $parsed_args['overwrite_package'],
  223. 'clear_working' => true,
  224. 'hook_extra' => array(
  225. 'type' => 'theme',
  226. 'action' => 'install',
  227. ),
  228. )
  229. );
  230. remove_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9 );
  231. remove_filter( 'upgrader_source_selection', array( $this, 'check_package' ) );
  232. remove_filter( 'upgrader_post_install', array( $this, 'check_parent_theme_filter' ) );
  233. if ( ! $this->result || is_wp_error( $this->result ) ) {
  234. return $this->result;
  235. }
  236. // Refresh the Theme Update information.
  237. wp_clean_themes_cache( $parsed_args['clear_update_cache'] );
  238. if ( $parsed_args['overwrite_package'] ) {
  239. /** This action is documented in wp-admin/includes/class-plugin-upgrader.php */
  240. do_action( 'upgrader_overwrote_package', $package, $this->new_theme_data, 'theme' );
  241. }
  242. return true;
  243. }
  244. /**
  245. * Upgrade a theme.
  246. *
  247. * @since 2.8.0
  248. * @since 3.7.0 The `$args` parameter was added, making clearing the update cache optional.
  249. *
  250. * @param string $theme The theme slug.
  251. * @param array $args {
  252. * Optional. Other arguments for upgrading a theme. Default empty array.
  253. *
  254. * @type bool $clear_update_cache Whether to clear the update cache if successful.
  255. * Default true.
  256. * }
  257. * @return bool|WP_Error True if the upgrade was successful, false or a WP_Error object otherwise.
  258. */
  259. public function upgrade( $theme, $args = array() ) {
  260. $defaults = array(
  261. 'clear_update_cache' => true,
  262. );
  263. $parsed_args = wp_parse_args( $args, $defaults );
  264. $this->init();
  265. $this->upgrade_strings();
  266. // Is an update available?
  267. $current = get_site_transient( 'update_themes' );
  268. if ( ! isset( $current->response[ $theme ] ) ) {
  269. $this->skin->before();
  270. $this->skin->set_result( false );
  271. $this->skin->error( 'up_to_date' );
  272. $this->skin->after();
  273. return false;
  274. }
  275. $r = $current->response[ $theme ];
  276. add_filter( 'upgrader_pre_install', array( $this, 'current_before' ), 10, 2 );
  277. add_filter( 'upgrader_post_install', array( $this, 'current_after' ), 10, 2 );
  278. add_filter( 'upgrader_clear_destination', array( $this, 'delete_old_theme' ), 10, 4 );
  279. if ( $parsed_args['clear_update_cache'] ) {
  280. // Clear cache so wp_update_themes() knows about the new theme.
  281. add_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9, 0 );
  282. }
  283. $this->run(
  284. array(
  285. 'package' => $r['package'],
  286. 'destination' => get_theme_root( $theme ),
  287. 'clear_destination' => true,
  288. 'clear_working' => true,
  289. 'hook_extra' => array(
  290. 'theme' => $theme,
  291. 'type' => 'theme',
  292. 'action' => 'update',
  293. ),
  294. )
  295. );
  296. remove_action( 'upgrader_process_complete', 'wp_clean_themes_cache', 9 );
  297. remove_filter( 'upgrader_pre_install', array( $this, 'current_before' ) );
  298. remove_filter( 'upgrader_post_install', array( $this, 'current_after' ) );
  299. remove_filter( 'upgrader_clear_destination', array( $this, 'delete_old_theme' ) );
  300. if ( ! $this->result || is_wp_error( $this->result ) ) {
  301. return $this->result;
  302. }
  303. wp_clean_themes_cache( $parsed_args['clear_update_cache'] );
  304. // Ensure any future auto-update failures trigger a failure email by removing
  305. // the last failure notification from the list when themes update successfully.
  306. $past_failure_emails = get_option( 'auto_plugin_theme_update_emails', array() );
  307. if ( isset( $past_failure_emails[ $theme ] ) ) {
  308. unset( $past_failure_emails[ $theme ] );
  309. update_option( 'auto_plugin_theme_update_emails', $past_failure_emails );
  310. }
  311. return true;
  312. }
  313. /**
  314. * Upgrade several themes at once.
  315. *
  316. * @since 3.0.0
  317. * @since 3.7.0 The `$args` parameter was added, making clearing the update cache optional.
  318. *
  319. * @param string[] $themes Array of the theme slugs.
  320. * @param array $args {
  321. * Optional. Other arguments for upgrading several themes at once. Default empty array.
  322. *
  323. * @type bool $clear_update_cache Whether to clear the update cache if successful.
  324. * Default true.
  325. * }
  326. * @return array[]|false An array of results, or false if unable to connect to the filesystem.
  327. */
  328. public function bulk_upgrade( $themes, $args = array() ) {
  329. $defaults = array(
  330. 'clear_update_cache' => true,
  331. );
  332. $parsed_args = wp_parse_args( $args, $defaults );
  333. $this->init();
  334. $this->bulk = true;
  335. $this->upgrade_strings();
  336. $current = get_site_transient( 'update_themes' );
  337. add_filter( 'upgrader_pre_install', array( $this, 'current_before' ), 10, 2 );
  338. add_filter( 'upgrader_post_install', array( $this, 'current_after' ), 10, 2 );
  339. add_filter( 'upgrader_clear_destination', array( $this, 'delete_old_theme' ), 10, 4 );
  340. $this->skin->header();
  341. // Connect to the filesystem first.
  342. $res = $this->fs_connect( array( WP_CONTENT_DIR ) );
  343. if ( ! $res ) {
  344. $this->skin->footer();
  345. return false;
  346. }
  347. $this->skin->bulk_header();
  348. /*
  349. * Only start maintenance mode if:
  350. * - running Multisite and there are one or more themes specified, OR
  351. * - a theme with an update available is currently in use.
  352. * @todo For multisite, maintenance mode should only kick in for individual sites if at all possible.
  353. */
  354. $maintenance = ( is_multisite() && ! empty( $themes ) );
  355. foreach ( $themes as $theme ) {
  356. $maintenance = $maintenance || get_stylesheet() === $theme || get_template() === $theme;
  357. }
  358. if ( $maintenance ) {
  359. $this->maintenance_mode( true );
  360. }
  361. $results = array();
  362. $this->update_count = count( $themes );
  363. $this->update_current = 0;
  364. foreach ( $themes as $theme ) {
  365. $this->update_current++;
  366. $this->skin->theme_info = $this->theme_info( $theme );
  367. if ( ! isset( $current->response[ $theme ] ) ) {
  368. $this->skin->set_result( true );
  369. $this->skin->before();
  370. $this->skin->feedback( 'up_to_date' );
  371. $this->skin->after();
  372. $results[ $theme ] = true;
  373. continue;
  374. }
  375. // Get the URL to the zip file.
  376. $r = $current->response[ $theme ];
  377. $result = $this->run(
  378. array(
  379. 'package' => $r['package'],
  380. 'destination' => get_theme_root( $theme ),
  381. 'clear_destination' => true,
  382. 'clear_working' => true,
  383. 'is_multi' => true,
  384. 'hook_extra' => array(
  385. 'theme' => $theme,
  386. ),
  387. )
  388. );
  389. $results[ $theme ] = $this->result;
  390. // Prevent credentials auth screen from displaying multiple times.
  391. if ( false === $result ) {
  392. break;
  393. }
  394. } // End foreach $themes.
  395. $this->maintenance_mode( false );
  396. // Refresh the Theme Update information.
  397. wp_clean_themes_cache( $parsed_args['clear_update_cache'] );
  398. /** This action is documented in wp-admin/includes/class-wp-upgrader.php */
  399. do_action(
  400. 'upgrader_process_complete',
  401. $this,
  402. array(
  403. 'action' => 'update',
  404. 'type' => 'theme',
  405. 'bulk' => true,
  406. 'themes' => $themes,
  407. )
  408. );
  409. $this->skin->bulk_footer();
  410. $this->skin->footer();
  411. // Cleanup our hooks, in case something else does a upgrade on this connection.
  412. remove_filter( 'upgrader_pre_install', array( $this, 'current_before' ) );
  413. remove_filter( 'upgrader_post_install', array( $this, 'current_after' ) );
  414. remove_filter( 'upgrader_clear_destination', array( $this, 'delete_old_theme' ) );
  415. // Ensure any future auto-update failures trigger a failure email by removing
  416. // the last failure notification from the list when themes update successfully.
  417. $past_failure_emails = get_option( 'auto_plugin_theme_update_emails', array() );
  418. foreach ( $results as $theme => $result ) {
  419. // Maintain last failure notification when themes failed to update manually.
  420. if ( ! $result || is_wp_error( $result ) || ! isset( $past_failure_emails[ $theme ] ) ) {
  421. continue;
  422. }
  423. unset( $past_failure_emails[ $theme ] );
  424. }
  425. update_option( 'auto_plugin_theme_update_emails', $past_failure_emails );
  426. return $results;
  427. }
  428. /**
  429. * Checks that the package source contains a valid theme.
  430. *
  431. * Hooked to the {@see 'upgrader_source_selection'} filter by Theme_Upgrader::install().
  432. *
  433. * @since 3.3.0
  434. *
  435. * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass.
  436. * @global string $wp_version The WordPress version string.
  437. *
  438. * @param string $source The path to the downloaded package source.
  439. * @return string|WP_Error The source as passed, or a WP_Error object on failure.
  440. */
  441. public function check_package( $source ) {
  442. global $wp_filesystem, $wp_version;
  443. $this->new_theme_data = array();
  444. if ( is_wp_error( $source ) ) {
  445. return $source;
  446. }
  447. // Check that the folder contains a valid theme.
  448. $working_directory = str_replace( $wp_filesystem->wp_content_dir(), trailingslashit( WP_CONTENT_DIR ), $source );
  449. if ( ! is_dir( $working_directory ) ) { // Sanity check, if the above fails, let's not prevent installation.
  450. return $source;
  451. }
  452. // A proper archive should have a style.css file in the single subdirectory.
  453. if ( ! file_exists( $working_directory . 'style.css' ) ) {
  454. return new WP_Error(
  455. 'incompatible_archive_theme_no_style',
  456. $this->strings['incompatible_archive'],
  457. sprintf(
  458. /* translators: %s: style.css */
  459. __( 'The theme is missing the %s stylesheet.' ),
  460. '<code>style.css</code>'
  461. )
  462. );
  463. }
  464. // All these headers are needed on Theme_Installer_Skin::do_overwrite().
  465. $info = get_file_data(
  466. $working_directory . 'style.css',
  467. array(
  468. 'Name' => 'Theme Name',
  469. 'Version' => 'Version',
  470. 'Author' => 'Author',
  471. 'Template' => 'Template',
  472. 'RequiresWP' => 'Requires at least',
  473. 'RequiresPHP' => 'Requires PHP',
  474. )
  475. );
  476. if ( empty( $info['Name'] ) ) {
  477. return new WP_Error(
  478. 'incompatible_archive_theme_no_name',
  479. $this->strings['incompatible_archive'],
  480. sprintf(
  481. /* translators: %s: style.css */
  482. __( 'The %s stylesheet doesn&#8217;t contain a valid theme header.' ),
  483. '<code>style.css</code>'
  484. )
  485. );
  486. }
  487. // If it's not a child theme, it must have at least an index.php to be legit.
  488. if ( empty( $info['Template'] ) && ! file_exists( $working_directory . 'index.php' ) ) {
  489. return new WP_Error(
  490. 'incompatible_archive_theme_no_index',
  491. $this->strings['incompatible_archive'],
  492. sprintf(
  493. /* translators: %s: index.php */
  494. __( 'The theme is missing the %s file.' ),
  495. '<code>index.php</code>'
  496. )
  497. );
  498. }
  499. $requires_php = isset( $info['RequiresPHP'] ) ? $info['RequiresPHP'] : null;
  500. $requires_wp = isset( $info['RequiresWP'] ) ? $info['RequiresWP'] : null;
  501. if ( ! is_php_version_compatible( $requires_php ) ) {
  502. $error = sprintf(
  503. /* translators: 1: Current PHP version, 2: Version required by the uploaded theme. */
  504. __( 'The PHP version on your server is %1$s, however the uploaded theme requires %2$s.' ),
  505. phpversion(),
  506. $requires_php
  507. );
  508. return new WP_Error( 'incompatible_php_required_version', $this->strings['incompatible_archive'], $error );
  509. }
  510. if ( ! is_wp_version_compatible( $requires_wp ) ) {
  511. $error = sprintf(
  512. /* translators: 1: Current WordPress version, 2: Version required by the uploaded theme. */
  513. __( 'Your WordPress version is %1$s, however the uploaded theme requires %2$s.' ),
  514. $wp_version,
  515. $requires_wp
  516. );
  517. return new WP_Error( 'incompatible_wp_required_version', $this->strings['incompatible_archive'], $error );
  518. }
  519. $this->new_theme_data = $info;
  520. return $source;
  521. }
  522. /**
  523. * Turn on maintenance mode before attempting to upgrade the current theme.
  524. *
  525. * Hooked to the {@see 'upgrader_pre_install'} filter by Theme_Upgrader::upgrade() and
  526. * Theme_Upgrader::bulk_upgrade().
  527. *
  528. * @since 2.8.0
  529. *
  530. * @param bool|WP_Error $return Upgrade offer return.
  531. * @param array $theme Theme arguments.
  532. * @return bool|WP_Error The passed in $return param or WP_Error.
  533. */
  534. public function current_before( $return, $theme ) {
  535. if ( is_wp_error( $return ) ) {
  536. return $return;
  537. }
  538. $theme = isset( $theme['theme'] ) ? $theme['theme'] : '';
  539. // Only run if current theme
  540. if ( get_stylesheet() !== $theme ) {
  541. return $return;
  542. }
  543. // Change to maintenance mode. Bulk edit handles this separately.
  544. if ( ! $this->bulk ) {
  545. $this->maintenance_mode( true );
  546. }
  547. return $return;
  548. }
  549. /**
  550. * Turn off maintenance mode after upgrading the current theme.
  551. *
  552. * Hooked to the {@see 'upgrader_post_install'} filter by Theme_Upgrader::upgrade()
  553. * and Theme_Upgrader::bulk_upgrade().
  554. *
  555. * @since 2.8.0
  556. *
  557. * @param bool|WP_Error $return Upgrade offer return.
  558. * @param array $theme Theme arguments.
  559. * @return bool|WP_Error The passed in $return param or WP_Error.
  560. */
  561. public function current_after( $return, $theme ) {
  562. if ( is_wp_error( $return ) ) {
  563. return $return;
  564. }
  565. $theme = isset( $theme['theme'] ) ? $theme['theme'] : '';
  566. // Only run if current theme.
  567. if ( get_stylesheet() !== $theme ) {
  568. return $return;
  569. }
  570. // Ensure stylesheet name hasn't changed after the upgrade:
  571. if ( get_stylesheet() === $theme && $theme !== $this->result['destination_name'] ) {
  572. wp_clean_themes_cache();
  573. $stylesheet = $this->result['destination_name'];
  574. switch_theme( $stylesheet );
  575. }
  576. // Time to remove maintenance mode. Bulk edit handles this separately.
  577. if ( ! $this->bulk ) {
  578. $this->maintenance_mode( false );
  579. }
  580. return $return;
  581. }
  582. /**
  583. * Delete the old theme during an upgrade.
  584. *
  585. * Hooked to the {@see 'upgrader_clear_destination'} filter by Theme_Upgrader::upgrade()
  586. * and Theme_Upgrader::bulk_upgrade().
  587. *
  588. * @since 2.8.0
  589. *
  590. * @global WP_Filesystem_Base $wp_filesystem Subclass
  591. *
  592. * @param bool $removed
  593. * @param string $local_destination
  594. * @param string $remote_destination
  595. * @param array $theme
  596. * @return bool
  597. */
  598. public function delete_old_theme( $removed, $local_destination, $remote_destination, $theme ) {
  599. global $wp_filesystem;
  600. if ( is_wp_error( $removed ) ) {
  601. return $removed; // Pass errors through.
  602. }
  603. if ( ! isset( $theme['theme'] ) ) {
  604. return $removed;
  605. }
  606. $theme = $theme['theme'];
  607. $themes_dir = trailingslashit( $wp_filesystem->wp_themes_dir( $theme ) );
  608. if ( $wp_filesystem->exists( $themes_dir . $theme ) ) {
  609. if ( ! $wp_filesystem->delete( $themes_dir . $theme, true ) ) {
  610. return false;
  611. }
  612. }
  613. return true;
  614. }
  615. /**
  616. * Get the WP_Theme object for a theme.
  617. *
  618. * @since 2.8.0
  619. * @since 3.0.0 The `$theme` argument was added.
  620. *
  621. * @param string $theme The directory name of the theme. This is optional, and if not supplied,
  622. * the directory name from the last result will be used.
  623. * @return WP_Theme|false The theme's info object, or false `$theme` is not supplied
  624. * and the last result isn't set.
  625. */
  626. public function theme_info( $theme = null ) {
  627. if ( empty( $theme ) ) {
  628. if ( ! empty( $this->result['destination_name'] ) ) {
  629. $theme = $this->result['destination_name'];
  630. } else {
  631. return false;
  632. }
  633. }
  634. $theme = wp_get_theme( $theme );
  635. $theme->cache_delete();
  636. return $theme;
  637. }
  638. }