Skip to content

Commit 2c1d36f

Browse files
committed
v1.1.2
1 parent 1084886 commit 2c1d36f

File tree

62 files changed

+129
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+129
-125
lines changed

ShopMax/CHANGELOG.md

Lines changed: 4 additions & 0 deletions

ShopMax/lib/app/controllers/shopify/product_detail_controller.dart renamed to ShopMax/lib/app/controllers/product_detail_controller.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1010

1111
import 'package:flutter/material.dart';
12-
import '/app/models/shopify/cart.dart';
13-
import '/app/models/shopify/cart_line_item.dart';
12+
import 'package:flutter_app/app/controllers/controller.dart';
13+
import '/app/models/cart.dart';
14+
import '/app/models/cart_line_item.dart';
1415
import '/bootstrap/enums/wishlist_action_enums.dart';
1516
import '/bootstrap/helpers.dart';
1617
import '/resources/widgets/buttons.dart';
17-
import '/resources/widgets/shopify/cart_quantity_widget.dart';
18-
import '/resources/widgets/shopify/product_quantity_widget.dart';
18+
import '/resources/widgets/cart_quantity_widget.dart';
19+
import '/resources/widgets/product_quantity_widget.dart';
1920
import '/resources/widgets/woosignal_ui.dart';
2021
import 'package:nylo_framework/nylo_framework.dart';
2122
import 'package:woosignal_shopify_api/models/product.dart' as ws_shopify;
22-
import '../controller.dart';
2323

2424
class ProductDetailController extends Controller {
2525
int quantity = 1;

ShopMax/lib/app/events/logout_event.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import '/config/storage_keys.dart';
22
import 'package:nylo_framework/nylo_framework.dart';
3-
import '/app/models/shopify/cart.dart';
3+
import '/app/models/cart.dart';
44

55
class LogoutEvent implements NyEvent {
66
@override

ShopMax/lib/app/models/billing_details.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1010

1111
import '/app/models/customer_address.dart';
12-
import '/app/models/shopify/checkout_session.dart';
12+
import 'checkout_session.dart';
1313

1414
class BillingDetails {
1515
CustomerAddress? billingAddress;

ShopMax/lib/app/models/shopify/cart.dart renamed to ShopMax/lib/app/models/cart.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
import 'dart:convert';
1212

1313
import 'package:collection/collection.dart';
14-
import '/app/models/shopify/cart_line_item.dart';
15-
import '/app/models/shopify/checkout_session.dart';
16-
import '/app/models/shopify/shipping_type.dart';
14+
import 'package:flutter_app/app/models/cart_line_item.dart';
15+
import 'package:flutter_app/app/models/shipping_type.dart';
16+
import 'checkout_session.dart';
1717
import '/bootstrap/app_helper.dart';
1818
import '/config/storage_keys.dart';
1919
import 'package:nylo_framework/nylo_framework.dart';

ShopMax/lib/app/models/shopify/checkout_session.dart renamed to ShopMax/lib/app/models/checkout_session.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1010

1111
import 'dart:convert';
12+
import 'package:flutter_app/app/models/cart.dart';
13+
import 'package:flutter_app/app/models/shipping_type.dart';
14+
1215
import '/app/models/billing_details.dart';
13-
import '/app/models/shopify/cart.dart';
1416
import '/app/models/customer_address.dart';
1517
import '/app/models/payment_type.dart';
16-
import '/app/models/shopify/shipping_type.dart';
1718
import '/bootstrap/app_helper.dart';
1819
import '/bootstrap/helpers.dart';
1920
import '/config/storage_keys.dart';

ShopMax/lib/app/providers/payments/example_pay.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import 'package:flutter/widgets.dart';
1414
import '/bootstrap/helpers.dart';
15-
import '/resources/pages/shopify/checkout_status_page.dart';
15+
import '/resources/pages/checkout_status_page.dart';
1616
import 'package:nylo_framework/nylo_framework.dart';
1717
import 'package:woosignal_shopify_api/models/response/order_created_response.dart';
1818
import 'package:woosignal_shopify_api/models/shopify_order.dart';

ShopMax/lib/app/providers/payments/shopify/paypal_pay.dart renamed to ShopMax/lib/app/providers/payments/paypal_pay.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1010

1111
import 'package:flutter/material.dart';
12-
import '/app/models/shopify/cart_line_item.dart';
13-
import '/app/models/shopify/checkout_session.dart';
12+
import 'package:flutter_app/app/models/cart_line_item.dart';
13+
import 'package:flutter_app/app/models/checkout_session.dart';
1414
import '/bootstrap/app_helper.dart';
1515
import '/bootstrap/helpers.dart';
16-
import '/resources/pages/shopify/checkout_confirmation_page.dart';
16+
import '../../../resources/pages/checkout_confirmation_page.dart';
1717
import 'package:flutter_paypal_payment/flutter_paypal_payment.dart';
1818
import 'package:nylo_framework/nylo_framework.dart';
1919
import 'package:woosignal_shopify_api/models/response/order_created_response.dart';
2020
import 'package:woosignal_shopify_api/models/shopify_order.dart';
2121
import '/bootstrap/data/order_shopify.dart';
22-
import '/resources/pages/shopify/checkout_status_page.dart';
22+
import '../../../resources/pages/checkout_status_page.dart';
2323

2424
payPalPay(context) async {
2525
await checkoutShopify((total, billingDetails, cart) async {

0 commit comments

Comments
 (0)