Multi-Store Android(v2.0) Version Released

Backend Change Log

– Countries CRUD (backend)
– Cities CRUD (backend)
– Zones CRUD (backend)
– Shipping With Zone CRUD (backend)
– Add shipping cost, minimum order and product unit at Products (backend)
– Add shipping enable at Shops (backend)
– Add country and city at user profile update api and convert at user (backend)
– Shipping Country By Shop Id (Api)
– Shipping City By Shop & Selected Country Id (Api)
– Shipping Cost Calculation By Country and City (Api)
– User validation fix at user profile update (Api)
– City id at zone not be optional (Backend)
– Unit Price bug fix (Backend)
– Attribute Detail Price fix (Backend)
– System user delete (Backend)
– Reset Email Url Changed (Backend)
– User Registration Validation fix (Api)
– define verify types at user registers (Api)

Android Change Log

– Added Country, city selection at checkout

– Added Shipping method checking in checkout

– Added Shipping cost and tax in transaction detail

– Added Product Additional Info, Min Order Amount

– Updated transaction detail

– Added Tax in transaction by shop

– Added Unit for product

– Added Measurement product

– Updated Edit Profile Address update

Backend Effected Files

– application/config/autoload.php
– application/controllers/backend/Products.php
– application/controllers/backend/Shops.php
– application/controllers/rest/Shipping_zones.php
– application/controllers/rest/Transactionheaders.php
– application/controllers/rest/Users.php
– application/core/API_Controller.php
– application/core/My_Model.php
– application/helpers/ps_mail_helper.php
– application/language/english/ps_lang.php
– application/libraries/PS_Adapter.php
– application/libraries/PS_Delete.php
– application/models/City.php
– application/models/Country.php
– application/models/Product.php
– application/models/Shipping_zone.php
– application/models/User.php
– application/models/Zone.php
– application/models/Zone_junction.php
– application/views/backend/cities/entry_form.php
– application/views/backend/cities/entry_form_script.php
– application/views/backend/cities/list.php
– application/views/backend/cities/list_script.php
– application/views/backend/cities/search_form.php
– application/views/backend/countries/entry_form.php
– application/views/backend/countries/entry_form_script.php
– application/views/backend/countries/list.php
– application/views/backend/countries/list_script.php
– application/views/backend/countries/search_form.php

– application/views/backend/products/entry_form.php
– application/views/backend/products/entry_form_script.php
– application/views/backend/products/list.php
– application/views/backend/shipping_zones/entry_form.php
– application/views/backend/shipping_zones/entry_form_script.php
– application/views/backend/shipping_zones/list.php
– application/views/backend/shipping_zones/list_script.php
– application/views/backend/shipping_zones/search_form.php
– application/views/backend/shops/entry_form.php
– application/views/backend/transactions/detail.php
– application/views/backend/zones/entry_form.php
– application/views/backend/zones/entry_form_script.php
– application/views/backend/zones/list.php
– application/views/backend/zones/list_script.php
– application/views/backend/zones/search_form.php
– application/controllers/backend/Cities.php
– application/controllers/backend/Countries.php
– application/controllers/backend/Shipping_zones.php
– application/controllers/backend/Shops.php
– application/views/backend/attributedetails/entry_form_script.php
– application/controllers/backend/System_users.php
– application/views/backend/system_users/list.php
– application/config/ps_config.php

Android Effected Files

*** Green Text are new added change log because of miss out.

updated : app/build.gradle
updated : app/src/main/java/com/panaceasoft/psmultistore/Config.java
updated : app/src/main/java/com/panaceasoft/psmultistore/MainActivity.java
updated : app/src/main/java/com/panaceasoft/psmultistore/api/PSApiService.java
updated : app/src/main/java/com/panaceasoft/psmultistore/binding/FragmentBindingAdapters.java
updated : app/src/main/java/com/panaceasoft/psmultistore/db/PSCoreDb.java
updated : app/src/main/java/com/panaceasoft/psmultistore/di/AppModule.java
updated : app/src/main/java/com/panaceasoft/psmultistore/di/MainActivityModule.java
updated : app/src/main/java/com/panaceasoft/psmultistore/di/ViewModelModule.java
updated : app/src/main/java/com/panaceasoft/psmultistore/repository/shippingmethod/ShippingMethodRepository.java
updated : app/src/main/java/com/panaceasoft/psmultistore/repository/user/UserRepository.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/basket/BasketListFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/basket/adapter/BasketAdapter.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/blog/detail/BlogDetailFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/checkout/CheckoutActivity.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/checkout/CheckoutFragment1.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/checkout/CheckoutFragment2.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/checkout/CheckoutFragment3.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/checkout/CheckoutStatusFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/checkout/adapter/ShippingMethodsAdapter.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/collection/CollectionFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/comment/detail/CommentDetailFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/comment/list/CommentListFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/common/NavigationController.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/common/PSFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/product/detail/ProductDetailFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/product/favourite/FavouriteListFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/product/list/ProductListFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/product/productbycatId/ProductListByCatIdFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/product/search/SearchByCategoryActivity.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/product/search/SearchCategoryFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/product/search/SearchFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/product/search/SearchSubCategoryFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/rating/RatingListFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/shop/selectedshop/SelectedShopFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/stripe/StripeFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/transaction/detail/TransactionFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/transaction/detail/adapter/TransactionAdapter.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/transaction/list/adapter/TransactionListAdapter.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/user/ProfileEditActivity.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/user/ProfileEditFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/user/UserFBRegisterFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/user/UserLoginFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/user/UserRegisterFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/user/verifyemail/VerifyEmailActivity.java
updated : app/src/main/java/com/panaceasoft/psmultistore/ui/user/verifyemail/VerifyEmailFragment.java
updated : app/src/main/java/com/panaceasoft/psmultistore/utils/Constants.java
updated : app/src/main/java/com/panaceasoft/psmultistore/viewmodel/product/ProductDetailViewModel.java
updated : app/src/main/java/com/panaceasoft/psmultistore/viewmodel/shippingmethod/ShippingMethodViewModel.java
updated : app/src/main/java/com/panaceasoft/psmultistore/viewmodel/shop/ShopViewModel.java
updated : app/src/main/java/com/panaceasoft/psmultistore/viewmodel/user/UserViewModel.java
updated : app/src/main/java/com/panaceasoft/psmultistore/viewobject/BasketProductToServer.java
updated : app/src/main/java/com/panaceasoft/psmultistore/viewobject/Product.java
updated : app/src/main/java/com/panaceasoft/psmultistore/viewobject/Shop.java
updated : app/src/main/java/com/panaceasoft/psmultistore/viewobject/TransactionDetail.java
updated : app/src/main/java/com/panaceasoft/psmultistore/viewobject/TransactionHeaderUpload.java
updated : app/src/main/java/com/panaceasoft/psmultistore/viewobject/TransactionObject.java
updated : app/src/main/java/com/panaceasoft/psmultistore/viewobject/User.java
updated : app/src/main/res/drawable-hdpi/app_icon.png
updated : app/src/main/res/drawable-mdpi/app_icon.png
updated : app/src/main/res/drawable-xhdpi/app_icon.png
updated : app/src/main/res/drawable-xxhdpi/app_icon.png
updated : app/src/main/res/drawable-xxxhdpi/app_icon.png
updated : app/src/main/res/drawable/{app_icon.png=>app_icon3.png}
updated : app/src/main/res/layout/checkout_fragment_1.xml
updated : app/src/main/res/layout/checkout_fragment_2.xml
updated : app/src/main/res/layout/checkout_fragment_3.xml
updated : app/src/main/res/layout/fragment_product_detail.xml
updated : app/src/main/res/layout/fragment_profile_edit.xml
updated : app/src/main/res/layout/fragment_transaction.xml
updated : app/src/main/res/layout/item_shipping_method.xml
updated : app/src/main/res/layout/item_transaction_adapter.xml
updated : app/src/main/res/values-ar/strings.xml
updated : app/src/main/res/values-de/strings.xml
updated : app/src/main/res/values-es/strings.xml
updated : app/src/main/res/values-fr/strings.xml
updated : app/src/main/res/values-hi-rIN/strings.xml
updated : app/src/main/res/values-in/strings.xml
updated : app/src/main/res/values-it/strings.xml
updated : app/src/main/res/values-ja/strings.xml
updated : app/src/main/res/values-ko/strings.xml
updated : app/src/main/res/values-ms/strings.xml
updated : app/src/main/res/values-pt/strings.xml
updated : app/src/main/res/values-ru/strings.xml
updated : app/src/main/res/values-th/strings.xml
updated : app/src/main/res/values-tr/strings.xml
updated : app/src/main/res/values-zh/strings.xml
updated : app/src/main/res/values/strings.xml
updated : build.gradle

created : app/src/main/java/com/panaceasoft/psmultistore/db/CityDao.java
created : app/src/main/java/com/panaceasoft/psmultistore/db/CountryDao.java
created : app/src/main/java/com/panaceasoft/psmultistore/repository/city/CityRepository.java
created : app/src/main/java/com/panaceasoft/psmultistore/repository/country/CountryRepository.java
created : app/src/main/java/com/panaceasoft/psmultistore/ui/product/search/SearchCityListFragment.java
created : app/src/main/java/com/panaceasoft/psmultistore/ui/product/search/SearchCountryListFragment.java
created : app/src/main/java/com/panaceasoft/psmultistore/ui/product/search/adapter/SearchCityAdapter.java
created : app/src/main/java/com/panaceasoft/psmultistore/ui/product/search/adapter/SearchCountryAdapter.java
created : app/src/main/java/com/panaceasoft/psmultistore/viewmodel/city/CityViewModel.java
created : app/src/main/java/com/panaceasoft/psmultistore/viewmodel/country/CountryViewModel.java
created : app/src/main/java/com/panaceasoft/psmultistore/viewobject/City.java
created : app/src/main/java/com/panaceasoft/psmultistore/viewobject/Country.java
created : app/src/main/java/com/panaceasoft/psmultistore/viewobject/ShippingCost.java
created : app/src/main/java/com/panaceasoft/psmultistore/viewobject/ShippingCostContainer.java
created : app/src/main/java/com/panaceasoft/psmultistore/viewobject/ShippingProductContainer.java
created : app/src/main/java/com/panaceasoft/psmultistore/viewobject/ShippingZone.java
created : app/src/main/java/com/panaceasoft/psmultistore/viewobject/ShopToServer.java
created : app/src/main/res/drawable-hdpi/app_icon.png
created : app/src/main/res/drawable-mdpi/app_icon.png
created : app/src/main/res/drawable-xhdpi/app_icon.png
created : app/src/main/res/drawable-xxhdpi/app_icon.png
created : app/src/main/res/drawable-xxxhdpi/app_icon.png
created : app/src/main/res/layout/fragment_search_city_list.xml
created : app/src/main/res/layout/fragment_search_country_list.xml
created : app/src/main/res/layout/item_search_city.xml
created : app/src/main/res/layout/item_search_country.xml

SQL

Copy to Clipboard

ALTER TABLE `mk_products` ADD `shipping_cost` DOUBLE NOT NULL AFTER `featured_date`, ADD `minimum_order` INT(11) NOT NULL AFTER `shipping_cost`, ADD `product_unit` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `minimum_order`;
ALTER TABLE `mk_shops` ADD `standard_shipping_enable` TINYINT(1) NOT NULL AFTER `messenger`, ADD `zone_shipping_enable` TINYINT(1) NOT NULL AFTER `standard_shipping_enable`, ADD `no_shipping_enable` TINYINT(1) NOT NULL AFTER `zone_shipping_enable`;

ALTER TABLE `core_users` ADD `country_id` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `verify_types`, ADD `city_id` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `country_id`;
INSERT INTO `core_modules` (`module_id`, `module_name`, `module_desc`, `module_icon`, `ordering`, `is_show_on_menu`, `group_id`) VALUES (’30’, ‘countries’, ‘Countries’, ”, ’10’, ‘1’, ‘1’);
INSERT INTO `core_modules` (`module_id`, `module_name`, `module_desc`, `module_icon`, `ordering`, `is_show_on_menu`, `group_id`) VALUES (’31’, ‘cities’, ‘Cities’, ”, ’10’, ‘1’, ‘1’);
INSERT INTO `core_modules` (`module_id`, `module_name`, `module_desc`, `module_icon`, `ordering`, `is_show_on_menu`, `group_id`) VALUES (’32’, ‘zones’, ‘Zones’, ”, ’10’, ‘1’, ‘1’);
INSERT INTO `core_modules` (`module_id`, `module_name`, `module_desc`, `module_icon`, `ordering`, `is_show_on_menu`, `group_id`) VALUES (’33’, ‘shipping_zones’, ‘Shipping Zones’, ”, ’10’, ‘1’, ‘1’);
ALTER TABLE `mk_transactions_header` ADD `is_zone_shipping` TINYINT(1) NOT NULL AFTER `memo`;
ALTER TABLE mk_transactions_detail ADD product_measurement VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER currency_short_form, ADD product_unit VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER product_measurement, ADD shipping_cost DOUBLE NOT NULL AFTER product_unit;
ALTER TABLE mk_products ADD product_measurement VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER product_unit;
CREATE TABLE `mk_countries` (
  `id` varchar(255) NOT NULL,
  `name` varchar(255) NOT NULL,
  `shop_id` varchar(255) NOT NULL,
  `status` tinyint(1) NOT NULL DEFAULT ‘1’,
  `added_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
  `updated_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
  `added_user_id` varchar(255) NOT NULL,
  `updated_user_id` varchar(255) NOT NULL,
  `updated_flag` int(11) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
ALTER TABLE `mk_countries`
  ADD PRIMARY KEY (`id`);
CREATE TABLE `mk_cities` (
  `id` varchar(255) NOT NULL,
  `country_id` varchar(255) NOT NULL,
  `name` varchar(255) NOT NULL,
  `shop_id` varchar(255) NOT NULL,
  `status` tinyint(1) NOT NULL DEFAULT ‘1’,
  `added_date` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
  `updated_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
  `added_user_id` varchar(255) NOT NULL,
  `updated_user_id` varchar(255) NOT NULL,
  `updated_flag` int(11) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
ALTER TABLE `mk_cities`
  ADD PRIMARY KEY (`id`);
CREATE TABLE `mk_zones` (
  `id` varchar(255) NOT NULL,
  `name` varchar(255) NOT NULL,
  `shop_id` varchar(255) NOT NULL,
  `status` tinyint(1) NOT NULL DEFAULT ‘1’,
  `added_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
  `updated_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
  `added_user_id` varchar(255) NOT NULL,
  `updated_user_id` varchar(255) NOT NULL,
  `updated_flag` int(11) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
ALTER TABLE `mk_zones`
  ADD PRIMARY KEY (`id`);
CREATE TABLE `mk_zones_junction` (
  `id` varchar(255) NOT NULL,
  `zone_id` varchar(255) NOT NULL,
  `country_id` varchar(255) NOT NULL,
  `city_id` varchar(255) NOT NULL,
  `shop_id` varchar(255) NOT NULL,
  `added_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
  `updated_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
  `added_user_id` varchar(255) NOT NULL,
  `updated_user_id` varchar(255) NOT NULL,
  `updated_flag` int(11) NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
ALTER TABLE `mk_zones_junction`
  ADD PRIMARY KEY (`id`);
CREATE TABLE `mk_shipping_zones` (
  `id` varchar(255) NOT NULL,
  `name` varchar(255) NOT NULL,
  `zone_id` varchar(255) NOT NULL,
  `shop_id` varchar(255) NOT NULL,
  `per_order_based_enabled` tinyint(1) NOT NULL,
  `per_item_based_enabled` tinyint(1) NOT NULL,
  `free_enabled` tinyint(1) NOT NULL,
  `per_order_based_cost` double NOT NULL,
  `per_item_based_cost` double NOT NULL,
  `per_item_based_from_product_cost_enable` tinyint(1) NOT NULL,
  `added_date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,

`updated_date` timestamp NOT NULL DEFAULT ‘0000-00-00 00:00:00’,
  `added_user_id` varchar(255) NOT NULL,
  `updated_user_id` varchar(255) NOT NULL,
  `updated_flag` int(11) NOT NULL,
  `status` tinyint(1) NOT NULL,
  `delivery_increment_of_zone` float NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
ALTER TABLE `mk_shipping_zones`
  ADD PRIMARY KEY (`id`);