From 60dd806f7c1c7f89311fff30bd239894ec2dded8 Mon Sep 17 00:00:00 2001 From: "mr.mojtaba" Date: Sun, 12 Oct 2025 12:05:02 +0330 Subject: [PATCH] feat : new changes from back --- .../remote/chicken/chicken_remote.dart | 15 ++- .../remote/chicken/chicken_remote_imp.dart | 30 ++++- .../create_steward_free_bar.dart | 12 +- .../create_steward_free_bar.freezed.dart | 42 ++++--- .../create_steward_free_bar.g.dart | 4 + .../steward_free_sale_bar_request.dart | 3 + ...steward_free_sale_bar_request.freezed.dart | 42 ++++--- .../steward_free_sale_bar_request.g.dart | 4 + .../steward_free_sale_bar.dart | 2 + .../steward_free_sale_bar.freezed.dart | 42 ++++--- .../steward_free_sale_bar.g.dart | 4 + .../chicken/chicken_repository.dart | 17 ++- .../chicken/chicken_repository_imp.dart | 22 +++- .../steward/buy_out_of_province/logic.dart | 34 ++++-- .../steward/buy_out_of_province/view.dart | 20 ++-- .../steward/sales_in_province/logic.dart | 112 ++++++++---------- .../pages/steward/sales_in_province/view.dart | 34 +++--- .../steward/sales_out_of_province/logic.dart | 57 ++++++--- .../steward/sales_out_of_province/view.dart | 98 +++++++++++++-- .../sales_out_of_province_buyers/logic.dart | 11 +- .../sales_out_of_province_buyers/view.dart | 6 +- .../logic.dart | 64 +++++----- .../view.dart | 30 ++++- 23 files changed, 472 insertions(+), 233 deletions(-) diff --git a/packages/chicken/lib/data/data_source/remote/chicken/chicken_remote.dart b/packages/chicken/lib/data/data_source/remote/chicken/chicken_remote.dart index df60d46..213bf09 100644 --- a/packages/chicken/lib/data/data_source/remote/chicken/chicken_remote.dart +++ b/packages/chicken/lib/data/data_source/remote/chicken/chicken_remote.dart @@ -104,11 +104,17 @@ abstract class ChickenRemoteDatasource { required CreateStewardFreeBar body, }); - Future editStewardPurchasesOutSideOfTheProvince({ + Future deleteStewardPurchasesOutSideOfTheProvince({ required String token, Map? queryParameters, }); + Future editStewardPurchasesOutSideOfTheProvince({ + required String token, + Map? queryParameters, + }); + + Future?> getOutProvinceCarcassesBuyer({ required String token, Map? queryParameters, @@ -138,6 +144,13 @@ abstract class ChickenRemoteDatasource { required StewardFreeSaleBarRequest body, }); + + Future deleteOutProvinceStewardFreeBar({ + required String token, + required String key + }); + + Future getUserProfile({required String token}); Future updateUserProfile({required String token, required UserProfile userProfile}); diff --git a/packages/chicken/lib/data/data_source/remote/chicken/chicken_remote_imp.dart b/packages/chicken/lib/data/data_source/remote/chicken/chicken_remote_imp.dart index 6eee9e6..76b2cbf 100644 --- a/packages/chicken/lib/data/data_source/remote/chicken/chicken_remote_imp.dart +++ b/packages/chicken/lib/data/data_source/remote/chicken/chicken_remote_imp.dart @@ -236,7 +236,7 @@ class ChickenRemoteDatasourceImp implements ChickenRemoteDatasource { await _httpClient.put( '/steward-allocation/0/', headers: {'Authorization': 'Bearer $token'}, - queryParameters: request.toJson(), + data: request.toJson(), ); } @@ -318,16 +318,29 @@ class ChickenRemoteDatasourceImp implements ChickenRemoteDatasource { ); } - //todo fix this @override - Future editStewardPurchasesOutSideOfTheProvince({ + Future editStewardPurchasesOutSideOfTheProvince({ + required String token, + Map? queryParameters, + }) async { + var data = await _httpClient.put( + '/steward_free_bar/0/', + headers: {'Authorization': 'Bearer $token'}, + data: queryParameters, + fromJson: CreateStewardFreeBar.fromJson, + ); + return data.data; + } + + @override + Future deleteStewardPurchasesOutSideOfTheProvince({ required String token, Map? queryParameters, }) async { await _httpClient.delete( '/steward_free_bar/0/', headers: {'Authorization': 'Bearer $token'}, - queryParameters: queryParameters + queryParameters: queryParameters, ); } @@ -403,6 +416,15 @@ class ChickenRemoteDatasourceImp implements ChickenRemoteDatasource { ); } + @override + Future deleteOutProvinceStewardFreeBar({required String token, required String key}) async { + await _httpClient.delete( + '/steward_free_sale_bar/0/', + queryParameters: {'key': key}, + headers: {'Authorization': 'Bearer $token'}, + ); + } + @override Future getUserProfile({required String token}) async { var res = await _httpClient.get( diff --git a/packages/chicken/lib/data/models/request/create_steward_free_bar/create_steward_free_bar.dart b/packages/chicken/lib/data/models/request/create_steward_free_bar/create_steward_free_bar.dart index 85a32aa..830a0ba 100644 --- a/packages/chicken/lib/data/models/request/create_steward_free_bar/create_steward_free_bar.dart +++ b/packages/chicken/lib/data/models/request/create_steward_free_bar/create_steward_free_bar.dart @@ -6,16 +6,18 @@ part 'create_steward_free_bar.g.dart'; @freezed abstract class CreateStewardFreeBar with _$CreateStewardFreeBar { const factory CreateStewardFreeBar({ - String? productKey, - String? killHouseName, - String? killHouseMobile, + String? productKey, + String? key, + String? killHouseName, + String? killHouseMobile, String? province, String? city, int? weightOfCarcasses, + int? numberOfCarcasses, String? date, - String? barImage, + String? barImage, }) = _CreateStewardFreeBar; factory CreateStewardFreeBar.fromJson(Map json) => _$CreateStewardFreeBarFromJson(json); -} \ No newline at end of file +} diff --git a/packages/chicken/lib/data/models/request/create_steward_free_bar/create_steward_free_bar.freezed.dart b/packages/chicken/lib/data/models/request/create_steward_free_bar/create_steward_free_bar.freezed.dart index 19ddf79..22c5f4f 100644 --- a/packages/chicken/lib/data/models/request/create_steward_free_bar/create_steward_free_bar.freezed.dart +++ b/packages/chicken/lib/data/models/request/create_steward_free_bar/create_steward_free_bar.freezed.dart @@ -15,7 +15,7 @@ T _$identity(T value) => value; /// @nodoc mixin _$CreateStewardFreeBar { - String? get productKey; String? get killHouseName; String? get killHouseMobile; String? get province; String? get city; int? get weightOfCarcasses; String? get date; String? get barImage; + String? get productKey; String? get key; String? get killHouseName; String? get killHouseMobile; String? get province; String? get city; int? get weightOfCarcasses; int? get numberOfCarcasses; String? get date; String? get barImage; /// Create a copy of CreateStewardFreeBar /// with the given fields replaced by the non-null parameter values. @JsonKey(includeFromJson: false, includeToJson: false) @@ -28,16 +28,16 @@ $CreateStewardFreeBarCopyWith get copyWith => _$CreateStew @override bool operator ==(Object other) { - return identical(this, other) || (other.runtimeType == runtimeType&&other is CreateStewardFreeBar&&(identical(other.productKey, productKey) || other.productKey == productKey)&&(identical(other.killHouseName, killHouseName) || other.killHouseName == killHouseName)&&(identical(other.killHouseMobile, killHouseMobile) || other.killHouseMobile == killHouseMobile)&&(identical(other.province, province) || other.province == province)&&(identical(other.city, city) || other.city == city)&&(identical(other.weightOfCarcasses, weightOfCarcasses) || other.weightOfCarcasses == weightOfCarcasses)&&(identical(other.date, date) || other.date == date)&&(identical(other.barImage, barImage) || other.barImage == barImage)); + return identical(this, other) || (other.runtimeType == runtimeType&&other is CreateStewardFreeBar&&(identical(other.productKey, productKey) || other.productKey == productKey)&&(identical(other.key, key) || other.key == key)&&(identical(other.killHouseName, killHouseName) || other.killHouseName == killHouseName)&&(identical(other.killHouseMobile, killHouseMobile) || other.killHouseMobile == killHouseMobile)&&(identical(other.province, province) || other.province == province)&&(identical(other.city, city) || other.city == city)&&(identical(other.weightOfCarcasses, weightOfCarcasses) || other.weightOfCarcasses == weightOfCarcasses)&&(identical(other.numberOfCarcasses, numberOfCarcasses) || other.numberOfCarcasses == numberOfCarcasses)&&(identical(other.date, date) || other.date == date)&&(identical(other.barImage, barImage) || other.barImage == barImage)); } @JsonKey(includeFromJson: false, includeToJson: false) @override -int get hashCode => Object.hash(runtimeType,productKey,killHouseName,killHouseMobile,province,city,weightOfCarcasses,date,barImage); +int get hashCode => Object.hash(runtimeType,productKey,key,killHouseName,killHouseMobile,province,city,weightOfCarcasses,numberOfCarcasses,date,barImage); @override String toString() { - return 'CreateStewardFreeBar(productKey: $productKey, killHouseName: $killHouseName, killHouseMobile: $killHouseMobile, province: $province, city: $city, weightOfCarcasses: $weightOfCarcasses, date: $date, barImage: $barImage)'; + return 'CreateStewardFreeBar(productKey: $productKey, key: $key, killHouseName: $killHouseName, killHouseMobile: $killHouseMobile, province: $province, city: $city, weightOfCarcasses: $weightOfCarcasses, numberOfCarcasses: $numberOfCarcasses, date: $date, barImage: $barImage)'; } @@ -48,7 +48,7 @@ abstract mixin class $CreateStewardFreeBarCopyWith<$Res> { factory $CreateStewardFreeBarCopyWith(CreateStewardFreeBar value, $Res Function(CreateStewardFreeBar) _then) = _$CreateStewardFreeBarCopyWithImpl; @useResult $Res call({ - String? productKey, String? killHouseName, String? killHouseMobile, String? province, String? city, int? weightOfCarcasses, String? date, String? barImage + String? productKey, String? key, String? killHouseName, String? killHouseMobile, String? province, String? city, int? weightOfCarcasses, int? numberOfCarcasses, String? date, String? barImage }); @@ -65,14 +65,16 @@ class _$CreateStewardFreeBarCopyWithImpl<$Res> /// Create a copy of CreateStewardFreeBar /// with the given fields replaced by the non-null parameter values. -@pragma('vm:prefer-inline') @override $Res call({Object? productKey = freezed,Object? killHouseName = freezed,Object? killHouseMobile = freezed,Object? province = freezed,Object? city = freezed,Object? weightOfCarcasses = freezed,Object? date = freezed,Object? barImage = freezed,}) { +@pragma('vm:prefer-inline') @override $Res call({Object? productKey = freezed,Object? key = freezed,Object? killHouseName = freezed,Object? killHouseMobile = freezed,Object? province = freezed,Object? city = freezed,Object? weightOfCarcasses = freezed,Object? numberOfCarcasses = freezed,Object? date = freezed,Object? barImage = freezed,}) { return _then(_self.copyWith( productKey: freezed == productKey ? _self.productKey : productKey // ignore: cast_nullable_to_non_nullable +as String?,key: freezed == key ? _self.key : key // ignore: cast_nullable_to_non_nullable as String?,killHouseName: freezed == killHouseName ? _self.killHouseName : killHouseName // ignore: cast_nullable_to_non_nullable as String?,killHouseMobile: freezed == killHouseMobile ? _self.killHouseMobile : killHouseMobile // ignore: cast_nullable_to_non_nullable as String?,province: freezed == province ? _self.province : province // ignore: cast_nullable_to_non_nullable as String?,city: freezed == city ? _self.city : city // ignore: cast_nullable_to_non_nullable as String?,weightOfCarcasses: freezed == weightOfCarcasses ? _self.weightOfCarcasses : weightOfCarcasses // ignore: cast_nullable_to_non_nullable +as int?,numberOfCarcasses: freezed == numberOfCarcasses ? _self.numberOfCarcasses : numberOfCarcasses // ignore: cast_nullable_to_non_nullable as int?,date: freezed == date ? _self.date : date // ignore: cast_nullable_to_non_nullable as String?,barImage: freezed == barImage ? _self.barImage : barImage // ignore: cast_nullable_to_non_nullable as String?, @@ -160,10 +162,10 @@ return $default(_that);case _: /// } /// ``` -@optionalTypeArgs TResult maybeWhen(TResult Function( String? productKey, String? killHouseName, String? killHouseMobile, String? province, String? city, int? weightOfCarcasses, String? date, String? barImage)? $default,{required TResult orElse(),}) {final _that = this; +@optionalTypeArgs TResult maybeWhen(TResult Function( String? productKey, String? key, String? killHouseName, String? killHouseMobile, String? province, String? city, int? weightOfCarcasses, int? numberOfCarcasses, String? date, String? barImage)? $default,{required TResult orElse(),}) {final _that = this; switch (_that) { case _CreateStewardFreeBar() when $default != null: -return $default(_that.productKey,_that.killHouseName,_that.killHouseMobile,_that.province,_that.city,_that.weightOfCarcasses,_that.date,_that.barImage);case _: +return $default(_that.productKey,_that.key,_that.killHouseName,_that.killHouseMobile,_that.province,_that.city,_that.weightOfCarcasses,_that.numberOfCarcasses,_that.date,_that.barImage);case _: return orElse(); } @@ -181,10 +183,10 @@ return $default(_that.productKey,_that.killHouseName,_that.killHouseMobile,_that /// } /// ``` -@optionalTypeArgs TResult when(TResult Function( String? productKey, String? killHouseName, String? killHouseMobile, String? province, String? city, int? weightOfCarcasses, String? date, String? barImage) $default,) {final _that = this; +@optionalTypeArgs TResult when(TResult Function( String? productKey, String? key, String? killHouseName, String? killHouseMobile, String? province, String? city, int? weightOfCarcasses, int? numberOfCarcasses, String? date, String? barImage) $default,) {final _that = this; switch (_that) { case _CreateStewardFreeBar(): -return $default(_that.productKey,_that.killHouseName,_that.killHouseMobile,_that.province,_that.city,_that.weightOfCarcasses,_that.date,_that.barImage);case _: +return $default(_that.productKey,_that.key,_that.killHouseName,_that.killHouseMobile,_that.province,_that.city,_that.weightOfCarcasses,_that.numberOfCarcasses,_that.date,_that.barImage);case _: throw StateError('Unexpected subclass'); } @@ -201,10 +203,10 @@ return $default(_that.productKey,_that.killHouseName,_that.killHouseMobile,_that /// } /// ``` -@optionalTypeArgs TResult? whenOrNull(TResult? Function( String? productKey, String? killHouseName, String? killHouseMobile, String? province, String? city, int? weightOfCarcasses, String? date, String? barImage)? $default,) {final _that = this; +@optionalTypeArgs TResult? whenOrNull(TResult? Function( String? productKey, String? key, String? killHouseName, String? killHouseMobile, String? province, String? city, int? weightOfCarcasses, int? numberOfCarcasses, String? date, String? barImage)? $default,) {final _that = this; switch (_that) { case _CreateStewardFreeBar() when $default != null: -return $default(_that.productKey,_that.killHouseName,_that.killHouseMobile,_that.province,_that.city,_that.weightOfCarcasses,_that.date,_that.barImage);case _: +return $default(_that.productKey,_that.key,_that.killHouseName,_that.killHouseMobile,_that.province,_that.city,_that.weightOfCarcasses,_that.numberOfCarcasses,_that.date,_that.barImage);case _: return null; } @@ -216,15 +218,17 @@ return $default(_that.productKey,_that.killHouseName,_that.killHouseMobile,_that @JsonSerializable() class _CreateStewardFreeBar implements CreateStewardFreeBar { - const _CreateStewardFreeBar({this.productKey, this.killHouseName, this.killHouseMobile, this.province, this.city, this.weightOfCarcasses, this.date, this.barImage}); + const _CreateStewardFreeBar({this.productKey, this.key, this.killHouseName, this.killHouseMobile, this.province, this.city, this.weightOfCarcasses, this.numberOfCarcasses, this.date, this.barImage}); factory _CreateStewardFreeBar.fromJson(Map json) => _$CreateStewardFreeBarFromJson(json); @override final String? productKey; +@override final String? key; @override final String? killHouseName; @override final String? killHouseMobile; @override final String? province; @override final String? city; @override final int? weightOfCarcasses; +@override final int? numberOfCarcasses; @override final String? date; @override final String? barImage; @@ -241,16 +245,16 @@ Map toJson() { @override bool operator ==(Object other) { - return identical(this, other) || (other.runtimeType == runtimeType&&other is _CreateStewardFreeBar&&(identical(other.productKey, productKey) || other.productKey == productKey)&&(identical(other.killHouseName, killHouseName) || other.killHouseName == killHouseName)&&(identical(other.killHouseMobile, killHouseMobile) || other.killHouseMobile == killHouseMobile)&&(identical(other.province, province) || other.province == province)&&(identical(other.city, city) || other.city == city)&&(identical(other.weightOfCarcasses, weightOfCarcasses) || other.weightOfCarcasses == weightOfCarcasses)&&(identical(other.date, date) || other.date == date)&&(identical(other.barImage, barImage) || other.barImage == barImage)); + return identical(this, other) || (other.runtimeType == runtimeType&&other is _CreateStewardFreeBar&&(identical(other.productKey, productKey) || other.productKey == productKey)&&(identical(other.key, key) || other.key == key)&&(identical(other.killHouseName, killHouseName) || other.killHouseName == killHouseName)&&(identical(other.killHouseMobile, killHouseMobile) || other.killHouseMobile == killHouseMobile)&&(identical(other.province, province) || other.province == province)&&(identical(other.city, city) || other.city == city)&&(identical(other.weightOfCarcasses, weightOfCarcasses) || other.weightOfCarcasses == weightOfCarcasses)&&(identical(other.numberOfCarcasses, numberOfCarcasses) || other.numberOfCarcasses == numberOfCarcasses)&&(identical(other.date, date) || other.date == date)&&(identical(other.barImage, barImage) || other.barImage == barImage)); } @JsonKey(includeFromJson: false, includeToJson: false) @override -int get hashCode => Object.hash(runtimeType,productKey,killHouseName,killHouseMobile,province,city,weightOfCarcasses,date,barImage); +int get hashCode => Object.hash(runtimeType,productKey,key,killHouseName,killHouseMobile,province,city,weightOfCarcasses,numberOfCarcasses,date,barImage); @override String toString() { - return 'CreateStewardFreeBar(productKey: $productKey, killHouseName: $killHouseName, killHouseMobile: $killHouseMobile, province: $province, city: $city, weightOfCarcasses: $weightOfCarcasses, date: $date, barImage: $barImage)'; + return 'CreateStewardFreeBar(productKey: $productKey, key: $key, killHouseName: $killHouseName, killHouseMobile: $killHouseMobile, province: $province, city: $city, weightOfCarcasses: $weightOfCarcasses, numberOfCarcasses: $numberOfCarcasses, date: $date, barImage: $barImage)'; } @@ -261,7 +265,7 @@ abstract mixin class _$CreateStewardFreeBarCopyWith<$Res> implements $CreateStew factory _$CreateStewardFreeBarCopyWith(_CreateStewardFreeBar value, $Res Function(_CreateStewardFreeBar) _then) = __$CreateStewardFreeBarCopyWithImpl; @override @useResult $Res call({ - String? productKey, String? killHouseName, String? killHouseMobile, String? province, String? city, int? weightOfCarcasses, String? date, String? barImage + String? productKey, String? key, String? killHouseName, String? killHouseMobile, String? province, String? city, int? weightOfCarcasses, int? numberOfCarcasses, String? date, String? barImage }); @@ -278,14 +282,16 @@ class __$CreateStewardFreeBarCopyWithImpl<$Res> /// Create a copy of CreateStewardFreeBar /// with the given fields replaced by the non-null parameter values. -@override @pragma('vm:prefer-inline') $Res call({Object? productKey = freezed,Object? killHouseName = freezed,Object? killHouseMobile = freezed,Object? province = freezed,Object? city = freezed,Object? weightOfCarcasses = freezed,Object? date = freezed,Object? barImage = freezed,}) { +@override @pragma('vm:prefer-inline') $Res call({Object? productKey = freezed,Object? key = freezed,Object? killHouseName = freezed,Object? killHouseMobile = freezed,Object? province = freezed,Object? city = freezed,Object? weightOfCarcasses = freezed,Object? numberOfCarcasses = freezed,Object? date = freezed,Object? barImage = freezed,}) { return _then(_CreateStewardFreeBar( productKey: freezed == productKey ? _self.productKey : productKey // ignore: cast_nullable_to_non_nullable +as String?,key: freezed == key ? _self.key : key // ignore: cast_nullable_to_non_nullable as String?,killHouseName: freezed == killHouseName ? _self.killHouseName : killHouseName // ignore: cast_nullable_to_non_nullable as String?,killHouseMobile: freezed == killHouseMobile ? _self.killHouseMobile : killHouseMobile // ignore: cast_nullable_to_non_nullable as String?,province: freezed == province ? _self.province : province // ignore: cast_nullable_to_non_nullable as String?,city: freezed == city ? _self.city : city // ignore: cast_nullable_to_non_nullable as String?,weightOfCarcasses: freezed == weightOfCarcasses ? _self.weightOfCarcasses : weightOfCarcasses // ignore: cast_nullable_to_non_nullable +as int?,numberOfCarcasses: freezed == numberOfCarcasses ? _self.numberOfCarcasses : numberOfCarcasses // ignore: cast_nullable_to_non_nullable as int?,date: freezed == date ? _self.date : date // ignore: cast_nullable_to_non_nullable as String?,barImage: freezed == barImage ? _self.barImage : barImage // ignore: cast_nullable_to_non_nullable as String?, diff --git a/packages/chicken/lib/data/models/request/create_steward_free_bar/create_steward_free_bar.g.dart b/packages/chicken/lib/data/models/request/create_steward_free_bar/create_steward_free_bar.g.dart index 50b4a74..f90c42d 100644 --- a/packages/chicken/lib/data/models/request/create_steward_free_bar/create_steward_free_bar.g.dart +++ b/packages/chicken/lib/data/models/request/create_steward_free_bar/create_steward_free_bar.g.dart @@ -10,11 +10,13 @@ _CreateStewardFreeBar _$CreateStewardFreeBarFromJson( Map json, ) => _CreateStewardFreeBar( productKey: json['product_key'] as String?, + key: json['key'] as String?, killHouseName: json['kill_house_name'] as String?, killHouseMobile: json['kill_house_mobile'] as String?, province: json['province'] as String?, city: json['city'] as String?, weightOfCarcasses: (json['weight_of_carcasses'] as num?)?.toInt(), + numberOfCarcasses: (json['number_of_carcasses'] as num?)?.toInt(), date: json['date'] as String?, barImage: json['bar_image'] as String?, ); @@ -23,11 +25,13 @@ Map _$CreateStewardFreeBarToJson( _CreateStewardFreeBar instance, ) => { 'product_key': instance.productKey, + 'key': instance.key, 'kill_house_name': instance.killHouseName, 'kill_house_mobile': instance.killHouseMobile, 'province': instance.province, 'city': instance.city, 'weight_of_carcasses': instance.weightOfCarcasses, + 'number_of_carcasses': instance.numberOfCarcasses, 'date': instance.date, 'bar_image': instance.barImage, }; diff --git a/packages/chicken/lib/data/models/request/steward_free_sale_bar/steward_free_sale_bar_request.dart b/packages/chicken/lib/data/models/request/steward_free_sale_bar/steward_free_sale_bar_request.dart index dd99fab..cfd2fe6 100644 --- a/packages/chicken/lib/data/models/request/steward_free_sale_bar/steward_free_sale_bar_request.dart +++ b/packages/chicken/lib/data/models/request/steward_free_sale_bar/steward_free_sale_bar_request.dart @@ -13,6 +13,9 @@ abstract class StewardFreeSaleBarRequest with _$StewardFreeSaleBarRequest { String? clearanceCode, String? productKey, String? key, + String? quota, + String? saleType, + }) = _StewardFreeSaleBarRequest; factory StewardFreeSaleBarRequest.fromJson(Map json) => diff --git a/packages/chicken/lib/data/models/request/steward_free_sale_bar/steward_free_sale_bar_request.freezed.dart b/packages/chicken/lib/data/models/request/steward_free_sale_bar/steward_free_sale_bar_request.freezed.dart index 20c21ba..3c0186a 100644 --- a/packages/chicken/lib/data/models/request/steward_free_sale_bar/steward_free_sale_bar_request.freezed.dart +++ b/packages/chicken/lib/data/models/request/steward_free_sale_bar/steward_free_sale_bar_request.freezed.dart @@ -15,7 +15,7 @@ T _$identity(T value) => value; /// @nodoc mixin _$StewardFreeSaleBarRequest { - String? get buyerKey; int? get numberOfCarcasses; int? get weightOfCarcasses; String? get date; String? get clearanceCode; String? get productKey; String? get key; + String? get buyerKey; int? get numberOfCarcasses; int? get weightOfCarcasses; String? get date; String? get clearanceCode; String? get productKey; String? get key; String? get quota; String? get saleType; /// Create a copy of StewardFreeSaleBarRequest /// with the given fields replaced by the non-null parameter values. @JsonKey(includeFromJson: false, includeToJson: false) @@ -28,16 +28,16 @@ $StewardFreeSaleBarRequestCopyWith get copyWith => _$ @override bool operator ==(Object other) { - return identical(this, other) || (other.runtimeType == runtimeType&&other is StewardFreeSaleBarRequest&&(identical(other.buyerKey, buyerKey) || other.buyerKey == buyerKey)&&(identical(other.numberOfCarcasses, numberOfCarcasses) || other.numberOfCarcasses == numberOfCarcasses)&&(identical(other.weightOfCarcasses, weightOfCarcasses) || other.weightOfCarcasses == weightOfCarcasses)&&(identical(other.date, date) || other.date == date)&&(identical(other.clearanceCode, clearanceCode) || other.clearanceCode == clearanceCode)&&(identical(other.productKey, productKey) || other.productKey == productKey)&&(identical(other.key, key) || other.key == key)); + return identical(this, other) || (other.runtimeType == runtimeType&&other is StewardFreeSaleBarRequest&&(identical(other.buyerKey, buyerKey) || other.buyerKey == buyerKey)&&(identical(other.numberOfCarcasses, numberOfCarcasses) || other.numberOfCarcasses == numberOfCarcasses)&&(identical(other.weightOfCarcasses, weightOfCarcasses) || other.weightOfCarcasses == weightOfCarcasses)&&(identical(other.date, date) || other.date == date)&&(identical(other.clearanceCode, clearanceCode) || other.clearanceCode == clearanceCode)&&(identical(other.productKey, productKey) || other.productKey == productKey)&&(identical(other.key, key) || other.key == key)&&(identical(other.quota, quota) || other.quota == quota)&&(identical(other.saleType, saleType) || other.saleType == saleType)); } @JsonKey(includeFromJson: false, includeToJson: false) @override -int get hashCode => Object.hash(runtimeType,buyerKey,numberOfCarcasses,weightOfCarcasses,date,clearanceCode,productKey,key); +int get hashCode => Object.hash(runtimeType,buyerKey,numberOfCarcasses,weightOfCarcasses,date,clearanceCode,productKey,key,quota,saleType); @override String toString() { - return 'StewardFreeSaleBarRequest(buyerKey: $buyerKey, numberOfCarcasses: $numberOfCarcasses, weightOfCarcasses: $weightOfCarcasses, date: $date, clearanceCode: $clearanceCode, productKey: $productKey, key: $key)'; + return 'StewardFreeSaleBarRequest(buyerKey: $buyerKey, numberOfCarcasses: $numberOfCarcasses, weightOfCarcasses: $weightOfCarcasses, date: $date, clearanceCode: $clearanceCode, productKey: $productKey, key: $key, quota: $quota, saleType: $saleType)'; } @@ -48,7 +48,7 @@ abstract mixin class $StewardFreeSaleBarRequestCopyWith<$Res> { factory $StewardFreeSaleBarRequestCopyWith(StewardFreeSaleBarRequest value, $Res Function(StewardFreeSaleBarRequest) _then) = _$StewardFreeSaleBarRequestCopyWithImpl; @useResult $Res call({ - String? buyerKey, int? numberOfCarcasses, int? weightOfCarcasses, String? date, String? clearanceCode, String? productKey, String? key + String? buyerKey, int? numberOfCarcasses, int? weightOfCarcasses, String? date, String? clearanceCode, String? productKey, String? key, String? quota, String? saleType }); @@ -65,7 +65,7 @@ class _$StewardFreeSaleBarRequestCopyWithImpl<$Res> /// Create a copy of StewardFreeSaleBarRequest /// with the given fields replaced by the non-null parameter values. -@pragma('vm:prefer-inline') @override $Res call({Object? buyerKey = freezed,Object? numberOfCarcasses = freezed,Object? weightOfCarcasses = freezed,Object? date = freezed,Object? clearanceCode = freezed,Object? productKey = freezed,Object? key = freezed,}) { +@pragma('vm:prefer-inline') @override $Res call({Object? buyerKey = freezed,Object? numberOfCarcasses = freezed,Object? weightOfCarcasses = freezed,Object? date = freezed,Object? clearanceCode = freezed,Object? productKey = freezed,Object? key = freezed,Object? quota = freezed,Object? saleType = freezed,}) { return _then(_self.copyWith( buyerKey: freezed == buyerKey ? _self.buyerKey : buyerKey // ignore: cast_nullable_to_non_nullable as String?,numberOfCarcasses: freezed == numberOfCarcasses ? _self.numberOfCarcasses : numberOfCarcasses // ignore: cast_nullable_to_non_nullable @@ -74,6 +74,8 @@ as int?,date: freezed == date ? _self.date : date // ignore: cast_nullable_to_no as String?,clearanceCode: freezed == clearanceCode ? _self.clearanceCode : clearanceCode // ignore: cast_nullable_to_non_nullable as String?,productKey: freezed == productKey ? _self.productKey : productKey // ignore: cast_nullable_to_non_nullable as String?,key: freezed == key ? _self.key : key // ignore: cast_nullable_to_non_nullable +as String?,quota: freezed == quota ? _self.quota : quota // ignore: cast_nullable_to_non_nullable +as String?,saleType: freezed == saleType ? _self.saleType : saleType // ignore: cast_nullable_to_non_nullable as String?, )); } @@ -159,10 +161,10 @@ return $default(_that);case _: /// } /// ``` -@optionalTypeArgs TResult maybeWhen(TResult Function( String? buyerKey, int? numberOfCarcasses, int? weightOfCarcasses, String? date, String? clearanceCode, String? productKey, String? key)? $default,{required TResult orElse(),}) {final _that = this; +@optionalTypeArgs TResult maybeWhen(TResult Function( String? buyerKey, int? numberOfCarcasses, int? weightOfCarcasses, String? date, String? clearanceCode, String? productKey, String? key, String? quota, String? saleType)? $default,{required TResult orElse(),}) {final _that = this; switch (_that) { case _StewardFreeSaleBarRequest() when $default != null: -return $default(_that.buyerKey,_that.numberOfCarcasses,_that.weightOfCarcasses,_that.date,_that.clearanceCode,_that.productKey,_that.key);case _: +return $default(_that.buyerKey,_that.numberOfCarcasses,_that.weightOfCarcasses,_that.date,_that.clearanceCode,_that.productKey,_that.key,_that.quota,_that.saleType);case _: return orElse(); } @@ -180,10 +182,10 @@ return $default(_that.buyerKey,_that.numberOfCarcasses,_that.weightOfCarcasses,_ /// } /// ``` -@optionalTypeArgs TResult when(TResult Function( String? buyerKey, int? numberOfCarcasses, int? weightOfCarcasses, String? date, String? clearanceCode, String? productKey, String? key) $default,) {final _that = this; +@optionalTypeArgs TResult when(TResult Function( String? buyerKey, int? numberOfCarcasses, int? weightOfCarcasses, String? date, String? clearanceCode, String? productKey, String? key, String? quota, String? saleType) $default,) {final _that = this; switch (_that) { case _StewardFreeSaleBarRequest(): -return $default(_that.buyerKey,_that.numberOfCarcasses,_that.weightOfCarcasses,_that.date,_that.clearanceCode,_that.productKey,_that.key);case _: +return $default(_that.buyerKey,_that.numberOfCarcasses,_that.weightOfCarcasses,_that.date,_that.clearanceCode,_that.productKey,_that.key,_that.quota,_that.saleType);case _: throw StateError('Unexpected subclass'); } @@ -200,10 +202,10 @@ return $default(_that.buyerKey,_that.numberOfCarcasses,_that.weightOfCarcasses,_ /// } /// ``` -@optionalTypeArgs TResult? whenOrNull(TResult? Function( String? buyerKey, int? numberOfCarcasses, int? weightOfCarcasses, String? date, String? clearanceCode, String? productKey, String? key)? $default,) {final _that = this; +@optionalTypeArgs TResult? whenOrNull(TResult? Function( String? buyerKey, int? numberOfCarcasses, int? weightOfCarcasses, String? date, String? clearanceCode, String? productKey, String? key, String? quota, String? saleType)? $default,) {final _that = this; switch (_that) { case _StewardFreeSaleBarRequest() when $default != null: -return $default(_that.buyerKey,_that.numberOfCarcasses,_that.weightOfCarcasses,_that.date,_that.clearanceCode,_that.productKey,_that.key);case _: +return $default(_that.buyerKey,_that.numberOfCarcasses,_that.weightOfCarcasses,_that.date,_that.clearanceCode,_that.productKey,_that.key,_that.quota,_that.saleType);case _: return null; } @@ -215,7 +217,7 @@ return $default(_that.buyerKey,_that.numberOfCarcasses,_that.weightOfCarcasses,_ @JsonSerializable() class _StewardFreeSaleBarRequest implements StewardFreeSaleBarRequest { - const _StewardFreeSaleBarRequest({this.buyerKey, this.numberOfCarcasses, this.weightOfCarcasses, this.date, this.clearanceCode, this.productKey, this.key}); + const _StewardFreeSaleBarRequest({this.buyerKey, this.numberOfCarcasses, this.weightOfCarcasses, this.date, this.clearanceCode, this.productKey, this.key, this.quota, this.saleType}); factory _StewardFreeSaleBarRequest.fromJson(Map json) => _$StewardFreeSaleBarRequestFromJson(json); @override final String? buyerKey; @@ -225,6 +227,8 @@ class _StewardFreeSaleBarRequest implements StewardFreeSaleBarRequest { @override final String? clearanceCode; @override final String? productKey; @override final String? key; +@override final String? quota; +@override final String? saleType; /// Create a copy of StewardFreeSaleBarRequest /// with the given fields replaced by the non-null parameter values. @@ -239,16 +243,16 @@ Map toJson() { @override bool operator ==(Object other) { - return identical(this, other) || (other.runtimeType == runtimeType&&other is _StewardFreeSaleBarRequest&&(identical(other.buyerKey, buyerKey) || other.buyerKey == buyerKey)&&(identical(other.numberOfCarcasses, numberOfCarcasses) || other.numberOfCarcasses == numberOfCarcasses)&&(identical(other.weightOfCarcasses, weightOfCarcasses) || other.weightOfCarcasses == weightOfCarcasses)&&(identical(other.date, date) || other.date == date)&&(identical(other.clearanceCode, clearanceCode) || other.clearanceCode == clearanceCode)&&(identical(other.productKey, productKey) || other.productKey == productKey)&&(identical(other.key, key) || other.key == key)); + return identical(this, other) || (other.runtimeType == runtimeType&&other is _StewardFreeSaleBarRequest&&(identical(other.buyerKey, buyerKey) || other.buyerKey == buyerKey)&&(identical(other.numberOfCarcasses, numberOfCarcasses) || other.numberOfCarcasses == numberOfCarcasses)&&(identical(other.weightOfCarcasses, weightOfCarcasses) || other.weightOfCarcasses == weightOfCarcasses)&&(identical(other.date, date) || other.date == date)&&(identical(other.clearanceCode, clearanceCode) || other.clearanceCode == clearanceCode)&&(identical(other.productKey, productKey) || other.productKey == productKey)&&(identical(other.key, key) || other.key == key)&&(identical(other.quota, quota) || other.quota == quota)&&(identical(other.saleType, saleType) || other.saleType == saleType)); } @JsonKey(includeFromJson: false, includeToJson: false) @override -int get hashCode => Object.hash(runtimeType,buyerKey,numberOfCarcasses,weightOfCarcasses,date,clearanceCode,productKey,key); +int get hashCode => Object.hash(runtimeType,buyerKey,numberOfCarcasses,weightOfCarcasses,date,clearanceCode,productKey,key,quota,saleType); @override String toString() { - return 'StewardFreeSaleBarRequest(buyerKey: $buyerKey, numberOfCarcasses: $numberOfCarcasses, weightOfCarcasses: $weightOfCarcasses, date: $date, clearanceCode: $clearanceCode, productKey: $productKey, key: $key)'; + return 'StewardFreeSaleBarRequest(buyerKey: $buyerKey, numberOfCarcasses: $numberOfCarcasses, weightOfCarcasses: $weightOfCarcasses, date: $date, clearanceCode: $clearanceCode, productKey: $productKey, key: $key, quota: $quota, saleType: $saleType)'; } @@ -259,7 +263,7 @@ abstract mixin class _$StewardFreeSaleBarRequestCopyWith<$Res> implements $Stewa factory _$StewardFreeSaleBarRequestCopyWith(_StewardFreeSaleBarRequest value, $Res Function(_StewardFreeSaleBarRequest) _then) = __$StewardFreeSaleBarRequestCopyWithImpl; @override @useResult $Res call({ - String? buyerKey, int? numberOfCarcasses, int? weightOfCarcasses, String? date, String? clearanceCode, String? productKey, String? key + String? buyerKey, int? numberOfCarcasses, int? weightOfCarcasses, String? date, String? clearanceCode, String? productKey, String? key, String? quota, String? saleType }); @@ -276,7 +280,7 @@ class __$StewardFreeSaleBarRequestCopyWithImpl<$Res> /// Create a copy of StewardFreeSaleBarRequest /// with the given fields replaced by the non-null parameter values. -@override @pragma('vm:prefer-inline') $Res call({Object? buyerKey = freezed,Object? numberOfCarcasses = freezed,Object? weightOfCarcasses = freezed,Object? date = freezed,Object? clearanceCode = freezed,Object? productKey = freezed,Object? key = freezed,}) { +@override @pragma('vm:prefer-inline') $Res call({Object? buyerKey = freezed,Object? numberOfCarcasses = freezed,Object? weightOfCarcasses = freezed,Object? date = freezed,Object? clearanceCode = freezed,Object? productKey = freezed,Object? key = freezed,Object? quota = freezed,Object? saleType = freezed,}) { return _then(_StewardFreeSaleBarRequest( buyerKey: freezed == buyerKey ? _self.buyerKey : buyerKey // ignore: cast_nullable_to_non_nullable as String?,numberOfCarcasses: freezed == numberOfCarcasses ? _self.numberOfCarcasses : numberOfCarcasses // ignore: cast_nullable_to_non_nullable @@ -285,6 +289,8 @@ as int?,date: freezed == date ? _self.date : date // ignore: cast_nullable_to_no as String?,clearanceCode: freezed == clearanceCode ? _self.clearanceCode : clearanceCode // ignore: cast_nullable_to_non_nullable as String?,productKey: freezed == productKey ? _self.productKey : productKey // ignore: cast_nullable_to_non_nullable as String?,key: freezed == key ? _self.key : key // ignore: cast_nullable_to_non_nullable +as String?,quota: freezed == quota ? _self.quota : quota // ignore: cast_nullable_to_non_nullable +as String?,saleType: freezed == saleType ? _self.saleType : saleType // ignore: cast_nullable_to_non_nullable as String?, )); } diff --git a/packages/chicken/lib/data/models/request/steward_free_sale_bar/steward_free_sale_bar_request.g.dart b/packages/chicken/lib/data/models/request/steward_free_sale_bar/steward_free_sale_bar_request.g.dart index 51b2faf..d182501 100644 --- a/packages/chicken/lib/data/models/request/steward_free_sale_bar/steward_free_sale_bar_request.g.dart +++ b/packages/chicken/lib/data/models/request/steward_free_sale_bar/steward_free_sale_bar_request.g.dart @@ -16,6 +16,8 @@ _StewardFreeSaleBarRequest _$StewardFreeSaleBarRequestFromJson( clearanceCode: json['clearance_code'] as String?, productKey: json['product_key'] as String?, key: json['key'] as String?, + quota: json['quota'] as String?, + saleType: json['sale_type'] as String?, ); Map _$StewardFreeSaleBarRequestToJson( @@ -28,4 +30,6 @@ Map _$StewardFreeSaleBarRequestToJson( 'clearance_code': instance.clearanceCode, 'product_key': instance.productKey, 'key': instance.key, + 'quota': instance.quota, + 'sale_type': instance.saleType, }; diff --git a/packages/chicken/lib/data/models/response/steward_free_sale_bar/steward_free_sale_bar.dart b/packages/chicken/lib/data/models/response/steward_free_sale_bar/steward_free_sale_bar.dart index 537a54e..403e083 100644 --- a/packages/chicken/lib/data/models/response/steward_free_sale_bar/steward_free_sale_bar.dart +++ b/packages/chicken/lib/data/models/response/steward_free_sale_bar/steward_free_sale_bar.dart @@ -28,6 +28,8 @@ abstract class StewardFreeSaleBar with _$StewardFreeSaleBar { bool? temporaryDeleted, String? createdBy, String? modifiedBy, + String? quota, + String? saleType, dynamic steward, dynamic guild, dynamic product, diff --git a/packages/chicken/lib/data/models/response/steward_free_sale_bar/steward_free_sale_bar.freezed.dart b/packages/chicken/lib/data/models/response/steward_free_sale_bar/steward_free_sale_bar.freezed.dart index de5120a..8654662 100644 --- a/packages/chicken/lib/data/models/response/steward_free_sale_bar/steward_free_sale_bar.freezed.dart +++ b/packages/chicken/lib/data/models/response/steward_free_sale_bar/steward_free_sale_bar.freezed.dart @@ -15,7 +15,7 @@ T _$identity(T value) => value; /// @nodoc mixin _$StewardFreeSaleBar { - int? get id; Buyer? get buyer; String? get key; String? get createDate; String? get modifyDate; bool? get trash; String? get buyerName; String? get buyerMobile; String? get province; String? get city; String? get driverName; String? get driverMobile; String? get typeCar; String? get pelak; String? get clearanceCode; int? get numberOfCarcasses; double? get weightOfCarcasses; String? get date; bool? get temporaryTrash; bool? get temporaryDeleted; String? get createdBy; String? get modifiedBy; dynamic get steward; dynamic get guild; dynamic get product; + int? get id; Buyer? get buyer; String? get key; String? get createDate; String? get modifyDate; bool? get trash; String? get buyerName; String? get buyerMobile; String? get province; String? get city; String? get driverName; String? get driverMobile; String? get typeCar; String? get pelak; String? get clearanceCode; int? get numberOfCarcasses; double? get weightOfCarcasses; String? get date; bool? get temporaryTrash; bool? get temporaryDeleted; String? get createdBy; String? get modifiedBy; String? get quota; String? get saleType; dynamic get steward; dynamic get guild; dynamic get product; /// Create a copy of StewardFreeSaleBar /// with the given fields replaced by the non-null parameter values. @JsonKey(includeFromJson: false, includeToJson: false) @@ -28,16 +28,16 @@ $StewardFreeSaleBarCopyWith get copyWith => _$StewardFreeSal @override bool operator ==(Object other) { - return identical(this, other) || (other.runtimeType == runtimeType&&other is StewardFreeSaleBar&&(identical(other.id, id) || other.id == id)&&(identical(other.buyer, buyer) || other.buyer == buyer)&&(identical(other.key, key) || other.key == key)&&(identical(other.createDate, createDate) || other.createDate == createDate)&&(identical(other.modifyDate, modifyDate) || other.modifyDate == modifyDate)&&(identical(other.trash, trash) || other.trash == trash)&&(identical(other.buyerName, buyerName) || other.buyerName == buyerName)&&(identical(other.buyerMobile, buyerMobile) || other.buyerMobile == buyerMobile)&&(identical(other.province, province) || other.province == province)&&(identical(other.city, city) || other.city == city)&&(identical(other.driverName, driverName) || other.driverName == driverName)&&(identical(other.driverMobile, driverMobile) || other.driverMobile == driverMobile)&&(identical(other.typeCar, typeCar) || other.typeCar == typeCar)&&(identical(other.pelak, pelak) || other.pelak == pelak)&&(identical(other.clearanceCode, clearanceCode) || other.clearanceCode == clearanceCode)&&(identical(other.numberOfCarcasses, numberOfCarcasses) || other.numberOfCarcasses == numberOfCarcasses)&&(identical(other.weightOfCarcasses, weightOfCarcasses) || other.weightOfCarcasses == weightOfCarcasses)&&(identical(other.date, date) || other.date == date)&&(identical(other.temporaryTrash, temporaryTrash) || other.temporaryTrash == temporaryTrash)&&(identical(other.temporaryDeleted, temporaryDeleted) || other.temporaryDeleted == temporaryDeleted)&&(identical(other.createdBy, createdBy) || other.createdBy == createdBy)&&(identical(other.modifiedBy, modifiedBy) || other.modifiedBy == modifiedBy)&&const DeepCollectionEquality().equals(other.steward, steward)&&const DeepCollectionEquality().equals(other.guild, guild)&&const DeepCollectionEquality().equals(other.product, product)); + return identical(this, other) || (other.runtimeType == runtimeType&&other is StewardFreeSaleBar&&(identical(other.id, id) || other.id == id)&&(identical(other.buyer, buyer) || other.buyer == buyer)&&(identical(other.key, key) || other.key == key)&&(identical(other.createDate, createDate) || other.createDate == createDate)&&(identical(other.modifyDate, modifyDate) || other.modifyDate == modifyDate)&&(identical(other.trash, trash) || other.trash == trash)&&(identical(other.buyerName, buyerName) || other.buyerName == buyerName)&&(identical(other.buyerMobile, buyerMobile) || other.buyerMobile == buyerMobile)&&(identical(other.province, province) || other.province == province)&&(identical(other.city, city) || other.city == city)&&(identical(other.driverName, driverName) || other.driverName == driverName)&&(identical(other.driverMobile, driverMobile) || other.driverMobile == driverMobile)&&(identical(other.typeCar, typeCar) || other.typeCar == typeCar)&&(identical(other.pelak, pelak) || other.pelak == pelak)&&(identical(other.clearanceCode, clearanceCode) || other.clearanceCode == clearanceCode)&&(identical(other.numberOfCarcasses, numberOfCarcasses) || other.numberOfCarcasses == numberOfCarcasses)&&(identical(other.weightOfCarcasses, weightOfCarcasses) || other.weightOfCarcasses == weightOfCarcasses)&&(identical(other.date, date) || other.date == date)&&(identical(other.temporaryTrash, temporaryTrash) || other.temporaryTrash == temporaryTrash)&&(identical(other.temporaryDeleted, temporaryDeleted) || other.temporaryDeleted == temporaryDeleted)&&(identical(other.createdBy, createdBy) || other.createdBy == createdBy)&&(identical(other.modifiedBy, modifiedBy) || other.modifiedBy == modifiedBy)&&(identical(other.quota, quota) || other.quota == quota)&&(identical(other.saleType, saleType) || other.saleType == saleType)&&const DeepCollectionEquality().equals(other.steward, steward)&&const DeepCollectionEquality().equals(other.guild, guild)&&const DeepCollectionEquality().equals(other.product, product)); } @JsonKey(includeFromJson: false, includeToJson: false) @override -int get hashCode => Object.hashAll([runtimeType,id,buyer,key,createDate,modifyDate,trash,buyerName,buyerMobile,province,city,driverName,driverMobile,typeCar,pelak,clearanceCode,numberOfCarcasses,weightOfCarcasses,date,temporaryTrash,temporaryDeleted,createdBy,modifiedBy,const DeepCollectionEquality().hash(steward),const DeepCollectionEquality().hash(guild),const DeepCollectionEquality().hash(product)]); +int get hashCode => Object.hashAll([runtimeType,id,buyer,key,createDate,modifyDate,trash,buyerName,buyerMobile,province,city,driverName,driverMobile,typeCar,pelak,clearanceCode,numberOfCarcasses,weightOfCarcasses,date,temporaryTrash,temporaryDeleted,createdBy,modifiedBy,quota,saleType,const DeepCollectionEquality().hash(steward),const DeepCollectionEquality().hash(guild),const DeepCollectionEquality().hash(product)]); @override String toString() { - return 'StewardFreeSaleBar(id: $id, buyer: $buyer, key: $key, createDate: $createDate, modifyDate: $modifyDate, trash: $trash, buyerName: $buyerName, buyerMobile: $buyerMobile, province: $province, city: $city, driverName: $driverName, driverMobile: $driverMobile, typeCar: $typeCar, pelak: $pelak, clearanceCode: $clearanceCode, numberOfCarcasses: $numberOfCarcasses, weightOfCarcasses: $weightOfCarcasses, date: $date, temporaryTrash: $temporaryTrash, temporaryDeleted: $temporaryDeleted, createdBy: $createdBy, modifiedBy: $modifiedBy, steward: $steward, guild: $guild, product: $product)'; + return 'StewardFreeSaleBar(id: $id, buyer: $buyer, key: $key, createDate: $createDate, modifyDate: $modifyDate, trash: $trash, buyerName: $buyerName, buyerMobile: $buyerMobile, province: $province, city: $city, driverName: $driverName, driverMobile: $driverMobile, typeCar: $typeCar, pelak: $pelak, clearanceCode: $clearanceCode, numberOfCarcasses: $numberOfCarcasses, weightOfCarcasses: $weightOfCarcasses, date: $date, temporaryTrash: $temporaryTrash, temporaryDeleted: $temporaryDeleted, createdBy: $createdBy, modifiedBy: $modifiedBy, quota: $quota, saleType: $saleType, steward: $steward, guild: $guild, product: $product)'; } @@ -48,7 +48,7 @@ abstract mixin class $StewardFreeSaleBarCopyWith<$Res> { factory $StewardFreeSaleBarCopyWith(StewardFreeSaleBar value, $Res Function(StewardFreeSaleBar) _then) = _$StewardFreeSaleBarCopyWithImpl; @useResult $Res call({ - int? id, Buyer? buyer, String? key, String? createDate, String? modifyDate, bool? trash, String? buyerName, String? buyerMobile, String? province, String? city, String? driverName, String? driverMobile, String? typeCar, String? pelak, String? clearanceCode, int? numberOfCarcasses, double? weightOfCarcasses, String? date, bool? temporaryTrash, bool? temporaryDeleted, String? createdBy, String? modifiedBy, dynamic steward, dynamic guild, dynamic product + int? id, Buyer? buyer, String? key, String? createDate, String? modifyDate, bool? trash, String? buyerName, String? buyerMobile, String? province, String? city, String? driverName, String? driverMobile, String? typeCar, String? pelak, String? clearanceCode, int? numberOfCarcasses, double? weightOfCarcasses, String? date, bool? temporaryTrash, bool? temporaryDeleted, String? createdBy, String? modifiedBy, String? quota, String? saleType, dynamic steward, dynamic guild, dynamic product }); @@ -65,7 +65,7 @@ class _$StewardFreeSaleBarCopyWithImpl<$Res> /// Create a copy of StewardFreeSaleBar /// with the given fields replaced by the non-null parameter values. -@pragma('vm:prefer-inline') @override $Res call({Object? id = freezed,Object? buyer = freezed,Object? key = freezed,Object? createDate = freezed,Object? modifyDate = freezed,Object? trash = freezed,Object? buyerName = freezed,Object? buyerMobile = freezed,Object? province = freezed,Object? city = freezed,Object? driverName = freezed,Object? driverMobile = freezed,Object? typeCar = freezed,Object? pelak = freezed,Object? clearanceCode = freezed,Object? numberOfCarcasses = freezed,Object? weightOfCarcasses = freezed,Object? date = freezed,Object? temporaryTrash = freezed,Object? temporaryDeleted = freezed,Object? createdBy = freezed,Object? modifiedBy = freezed,Object? steward = freezed,Object? guild = freezed,Object? product = freezed,}) { +@pragma('vm:prefer-inline') @override $Res call({Object? id = freezed,Object? buyer = freezed,Object? key = freezed,Object? createDate = freezed,Object? modifyDate = freezed,Object? trash = freezed,Object? buyerName = freezed,Object? buyerMobile = freezed,Object? province = freezed,Object? city = freezed,Object? driverName = freezed,Object? driverMobile = freezed,Object? typeCar = freezed,Object? pelak = freezed,Object? clearanceCode = freezed,Object? numberOfCarcasses = freezed,Object? weightOfCarcasses = freezed,Object? date = freezed,Object? temporaryTrash = freezed,Object? temporaryDeleted = freezed,Object? createdBy = freezed,Object? modifiedBy = freezed,Object? quota = freezed,Object? saleType = freezed,Object? steward = freezed,Object? guild = freezed,Object? product = freezed,}) { return _then(_self.copyWith( id: freezed == id ? _self.id : id // ignore: cast_nullable_to_non_nullable as int?,buyer: freezed == buyer ? _self.buyer : buyer // ignore: cast_nullable_to_non_nullable @@ -89,6 +89,8 @@ as String?,temporaryTrash: freezed == temporaryTrash ? _self.temporaryTrash : te as bool?,temporaryDeleted: freezed == temporaryDeleted ? _self.temporaryDeleted : temporaryDeleted // ignore: cast_nullable_to_non_nullable as bool?,createdBy: freezed == createdBy ? _self.createdBy : createdBy // ignore: cast_nullable_to_non_nullable as String?,modifiedBy: freezed == modifiedBy ? _self.modifiedBy : modifiedBy // ignore: cast_nullable_to_non_nullable +as String?,quota: freezed == quota ? _self.quota : quota // ignore: cast_nullable_to_non_nullable +as String?,saleType: freezed == saleType ? _self.saleType : saleType // ignore: cast_nullable_to_non_nullable as String?,steward: freezed == steward ? _self.steward : steward // ignore: cast_nullable_to_non_nullable as dynamic,guild: freezed == guild ? _self.guild : guild // ignore: cast_nullable_to_non_nullable as dynamic,product: freezed == product ? _self.product : product // ignore: cast_nullable_to_non_nullable @@ -189,10 +191,10 @@ return $default(_that);case _: /// } /// ``` -@optionalTypeArgs TResult maybeWhen(TResult Function( int? id, Buyer? buyer, String? key, String? createDate, String? modifyDate, bool? trash, String? buyerName, String? buyerMobile, String? province, String? city, String? driverName, String? driverMobile, String? typeCar, String? pelak, String? clearanceCode, int? numberOfCarcasses, double? weightOfCarcasses, String? date, bool? temporaryTrash, bool? temporaryDeleted, String? createdBy, String? modifiedBy, dynamic steward, dynamic guild, dynamic product)? $default,{required TResult orElse(),}) {final _that = this; +@optionalTypeArgs TResult maybeWhen(TResult Function( int? id, Buyer? buyer, String? key, String? createDate, String? modifyDate, bool? trash, String? buyerName, String? buyerMobile, String? province, String? city, String? driverName, String? driverMobile, String? typeCar, String? pelak, String? clearanceCode, int? numberOfCarcasses, double? weightOfCarcasses, String? date, bool? temporaryTrash, bool? temporaryDeleted, String? createdBy, String? modifiedBy, String? quota, String? saleType, dynamic steward, dynamic guild, dynamic product)? $default,{required TResult orElse(),}) {final _that = this; switch (_that) { case _StewardFreeSaleBar() when $default != null: -return $default(_that.id,_that.buyer,_that.key,_that.createDate,_that.modifyDate,_that.trash,_that.buyerName,_that.buyerMobile,_that.province,_that.city,_that.driverName,_that.driverMobile,_that.typeCar,_that.pelak,_that.clearanceCode,_that.numberOfCarcasses,_that.weightOfCarcasses,_that.date,_that.temporaryTrash,_that.temporaryDeleted,_that.createdBy,_that.modifiedBy,_that.steward,_that.guild,_that.product);case _: +return $default(_that.id,_that.buyer,_that.key,_that.createDate,_that.modifyDate,_that.trash,_that.buyerName,_that.buyerMobile,_that.province,_that.city,_that.driverName,_that.driverMobile,_that.typeCar,_that.pelak,_that.clearanceCode,_that.numberOfCarcasses,_that.weightOfCarcasses,_that.date,_that.temporaryTrash,_that.temporaryDeleted,_that.createdBy,_that.modifiedBy,_that.quota,_that.saleType,_that.steward,_that.guild,_that.product);case _: return orElse(); } @@ -210,10 +212,10 @@ return $default(_that.id,_that.buyer,_that.key,_that.createDate,_that.modifyDate /// } /// ``` -@optionalTypeArgs TResult when(TResult Function( int? id, Buyer? buyer, String? key, String? createDate, String? modifyDate, bool? trash, String? buyerName, String? buyerMobile, String? province, String? city, String? driverName, String? driverMobile, String? typeCar, String? pelak, String? clearanceCode, int? numberOfCarcasses, double? weightOfCarcasses, String? date, bool? temporaryTrash, bool? temporaryDeleted, String? createdBy, String? modifiedBy, dynamic steward, dynamic guild, dynamic product) $default,) {final _that = this; +@optionalTypeArgs TResult when(TResult Function( int? id, Buyer? buyer, String? key, String? createDate, String? modifyDate, bool? trash, String? buyerName, String? buyerMobile, String? province, String? city, String? driverName, String? driverMobile, String? typeCar, String? pelak, String? clearanceCode, int? numberOfCarcasses, double? weightOfCarcasses, String? date, bool? temporaryTrash, bool? temporaryDeleted, String? createdBy, String? modifiedBy, String? quota, String? saleType, dynamic steward, dynamic guild, dynamic product) $default,) {final _that = this; switch (_that) { case _StewardFreeSaleBar(): -return $default(_that.id,_that.buyer,_that.key,_that.createDate,_that.modifyDate,_that.trash,_that.buyerName,_that.buyerMobile,_that.province,_that.city,_that.driverName,_that.driverMobile,_that.typeCar,_that.pelak,_that.clearanceCode,_that.numberOfCarcasses,_that.weightOfCarcasses,_that.date,_that.temporaryTrash,_that.temporaryDeleted,_that.createdBy,_that.modifiedBy,_that.steward,_that.guild,_that.product);case _: +return $default(_that.id,_that.buyer,_that.key,_that.createDate,_that.modifyDate,_that.trash,_that.buyerName,_that.buyerMobile,_that.province,_that.city,_that.driverName,_that.driverMobile,_that.typeCar,_that.pelak,_that.clearanceCode,_that.numberOfCarcasses,_that.weightOfCarcasses,_that.date,_that.temporaryTrash,_that.temporaryDeleted,_that.createdBy,_that.modifiedBy,_that.quota,_that.saleType,_that.steward,_that.guild,_that.product);case _: throw StateError('Unexpected subclass'); } @@ -230,10 +232,10 @@ return $default(_that.id,_that.buyer,_that.key,_that.createDate,_that.modifyDate /// } /// ``` -@optionalTypeArgs TResult? whenOrNull(TResult? Function( int? id, Buyer? buyer, String? key, String? createDate, String? modifyDate, bool? trash, String? buyerName, String? buyerMobile, String? province, String? city, String? driverName, String? driverMobile, String? typeCar, String? pelak, String? clearanceCode, int? numberOfCarcasses, double? weightOfCarcasses, String? date, bool? temporaryTrash, bool? temporaryDeleted, String? createdBy, String? modifiedBy, dynamic steward, dynamic guild, dynamic product)? $default,) {final _that = this; +@optionalTypeArgs TResult? whenOrNull(TResult? Function( int? id, Buyer? buyer, String? key, String? createDate, String? modifyDate, bool? trash, String? buyerName, String? buyerMobile, String? province, String? city, String? driverName, String? driverMobile, String? typeCar, String? pelak, String? clearanceCode, int? numberOfCarcasses, double? weightOfCarcasses, String? date, bool? temporaryTrash, bool? temporaryDeleted, String? createdBy, String? modifiedBy, String? quota, String? saleType, dynamic steward, dynamic guild, dynamic product)? $default,) {final _that = this; switch (_that) { case _StewardFreeSaleBar() when $default != null: -return $default(_that.id,_that.buyer,_that.key,_that.createDate,_that.modifyDate,_that.trash,_that.buyerName,_that.buyerMobile,_that.province,_that.city,_that.driverName,_that.driverMobile,_that.typeCar,_that.pelak,_that.clearanceCode,_that.numberOfCarcasses,_that.weightOfCarcasses,_that.date,_that.temporaryTrash,_that.temporaryDeleted,_that.createdBy,_that.modifiedBy,_that.steward,_that.guild,_that.product);case _: +return $default(_that.id,_that.buyer,_that.key,_that.createDate,_that.modifyDate,_that.trash,_that.buyerName,_that.buyerMobile,_that.province,_that.city,_that.driverName,_that.driverMobile,_that.typeCar,_that.pelak,_that.clearanceCode,_that.numberOfCarcasses,_that.weightOfCarcasses,_that.date,_that.temporaryTrash,_that.temporaryDeleted,_that.createdBy,_that.modifiedBy,_that.quota,_that.saleType,_that.steward,_that.guild,_that.product);case _: return null; } @@ -245,7 +247,7 @@ return $default(_that.id,_that.buyer,_that.key,_that.createDate,_that.modifyDate @JsonSerializable() class _StewardFreeSaleBar implements StewardFreeSaleBar { - const _StewardFreeSaleBar({this.id, this.buyer, this.key, this.createDate, this.modifyDate, this.trash, this.buyerName, this.buyerMobile, this.province, this.city, this.driverName, this.driverMobile, this.typeCar, this.pelak, this.clearanceCode, this.numberOfCarcasses, this.weightOfCarcasses, this.date, this.temporaryTrash, this.temporaryDeleted, this.createdBy, this.modifiedBy, this.steward, this.guild, this.product}); + const _StewardFreeSaleBar({this.id, this.buyer, this.key, this.createDate, this.modifyDate, this.trash, this.buyerName, this.buyerMobile, this.province, this.city, this.driverName, this.driverMobile, this.typeCar, this.pelak, this.clearanceCode, this.numberOfCarcasses, this.weightOfCarcasses, this.date, this.temporaryTrash, this.temporaryDeleted, this.createdBy, this.modifiedBy, this.quota, this.saleType, this.steward, this.guild, this.product}); factory _StewardFreeSaleBar.fromJson(Map json) => _$StewardFreeSaleBarFromJson(json); @override final int? id; @@ -270,6 +272,8 @@ class _StewardFreeSaleBar implements StewardFreeSaleBar { @override final bool? temporaryDeleted; @override final String? createdBy; @override final String? modifiedBy; +@override final String? quota; +@override final String? saleType; @override final dynamic steward; @override final dynamic guild; @override final dynamic product; @@ -287,16 +291,16 @@ Map toJson() { @override bool operator ==(Object other) { - return identical(this, other) || (other.runtimeType == runtimeType&&other is _StewardFreeSaleBar&&(identical(other.id, id) || other.id == id)&&(identical(other.buyer, buyer) || other.buyer == buyer)&&(identical(other.key, key) || other.key == key)&&(identical(other.createDate, createDate) || other.createDate == createDate)&&(identical(other.modifyDate, modifyDate) || other.modifyDate == modifyDate)&&(identical(other.trash, trash) || other.trash == trash)&&(identical(other.buyerName, buyerName) || other.buyerName == buyerName)&&(identical(other.buyerMobile, buyerMobile) || other.buyerMobile == buyerMobile)&&(identical(other.province, province) || other.province == province)&&(identical(other.city, city) || other.city == city)&&(identical(other.driverName, driverName) || other.driverName == driverName)&&(identical(other.driverMobile, driverMobile) || other.driverMobile == driverMobile)&&(identical(other.typeCar, typeCar) || other.typeCar == typeCar)&&(identical(other.pelak, pelak) || other.pelak == pelak)&&(identical(other.clearanceCode, clearanceCode) || other.clearanceCode == clearanceCode)&&(identical(other.numberOfCarcasses, numberOfCarcasses) || other.numberOfCarcasses == numberOfCarcasses)&&(identical(other.weightOfCarcasses, weightOfCarcasses) || other.weightOfCarcasses == weightOfCarcasses)&&(identical(other.date, date) || other.date == date)&&(identical(other.temporaryTrash, temporaryTrash) || other.temporaryTrash == temporaryTrash)&&(identical(other.temporaryDeleted, temporaryDeleted) || other.temporaryDeleted == temporaryDeleted)&&(identical(other.createdBy, createdBy) || other.createdBy == createdBy)&&(identical(other.modifiedBy, modifiedBy) || other.modifiedBy == modifiedBy)&&const DeepCollectionEquality().equals(other.steward, steward)&&const DeepCollectionEquality().equals(other.guild, guild)&&const DeepCollectionEquality().equals(other.product, product)); + return identical(this, other) || (other.runtimeType == runtimeType&&other is _StewardFreeSaleBar&&(identical(other.id, id) || other.id == id)&&(identical(other.buyer, buyer) || other.buyer == buyer)&&(identical(other.key, key) || other.key == key)&&(identical(other.createDate, createDate) || other.createDate == createDate)&&(identical(other.modifyDate, modifyDate) || other.modifyDate == modifyDate)&&(identical(other.trash, trash) || other.trash == trash)&&(identical(other.buyerName, buyerName) || other.buyerName == buyerName)&&(identical(other.buyerMobile, buyerMobile) || other.buyerMobile == buyerMobile)&&(identical(other.province, province) || other.province == province)&&(identical(other.city, city) || other.city == city)&&(identical(other.driverName, driverName) || other.driverName == driverName)&&(identical(other.driverMobile, driverMobile) || other.driverMobile == driverMobile)&&(identical(other.typeCar, typeCar) || other.typeCar == typeCar)&&(identical(other.pelak, pelak) || other.pelak == pelak)&&(identical(other.clearanceCode, clearanceCode) || other.clearanceCode == clearanceCode)&&(identical(other.numberOfCarcasses, numberOfCarcasses) || other.numberOfCarcasses == numberOfCarcasses)&&(identical(other.weightOfCarcasses, weightOfCarcasses) || other.weightOfCarcasses == weightOfCarcasses)&&(identical(other.date, date) || other.date == date)&&(identical(other.temporaryTrash, temporaryTrash) || other.temporaryTrash == temporaryTrash)&&(identical(other.temporaryDeleted, temporaryDeleted) || other.temporaryDeleted == temporaryDeleted)&&(identical(other.createdBy, createdBy) || other.createdBy == createdBy)&&(identical(other.modifiedBy, modifiedBy) || other.modifiedBy == modifiedBy)&&(identical(other.quota, quota) || other.quota == quota)&&(identical(other.saleType, saleType) || other.saleType == saleType)&&const DeepCollectionEquality().equals(other.steward, steward)&&const DeepCollectionEquality().equals(other.guild, guild)&&const DeepCollectionEquality().equals(other.product, product)); } @JsonKey(includeFromJson: false, includeToJson: false) @override -int get hashCode => Object.hashAll([runtimeType,id,buyer,key,createDate,modifyDate,trash,buyerName,buyerMobile,province,city,driverName,driverMobile,typeCar,pelak,clearanceCode,numberOfCarcasses,weightOfCarcasses,date,temporaryTrash,temporaryDeleted,createdBy,modifiedBy,const DeepCollectionEquality().hash(steward),const DeepCollectionEquality().hash(guild),const DeepCollectionEquality().hash(product)]); +int get hashCode => Object.hashAll([runtimeType,id,buyer,key,createDate,modifyDate,trash,buyerName,buyerMobile,province,city,driverName,driverMobile,typeCar,pelak,clearanceCode,numberOfCarcasses,weightOfCarcasses,date,temporaryTrash,temporaryDeleted,createdBy,modifiedBy,quota,saleType,const DeepCollectionEquality().hash(steward),const DeepCollectionEquality().hash(guild),const DeepCollectionEquality().hash(product)]); @override String toString() { - return 'StewardFreeSaleBar(id: $id, buyer: $buyer, key: $key, createDate: $createDate, modifyDate: $modifyDate, trash: $trash, buyerName: $buyerName, buyerMobile: $buyerMobile, province: $province, city: $city, driverName: $driverName, driverMobile: $driverMobile, typeCar: $typeCar, pelak: $pelak, clearanceCode: $clearanceCode, numberOfCarcasses: $numberOfCarcasses, weightOfCarcasses: $weightOfCarcasses, date: $date, temporaryTrash: $temporaryTrash, temporaryDeleted: $temporaryDeleted, createdBy: $createdBy, modifiedBy: $modifiedBy, steward: $steward, guild: $guild, product: $product)'; + return 'StewardFreeSaleBar(id: $id, buyer: $buyer, key: $key, createDate: $createDate, modifyDate: $modifyDate, trash: $trash, buyerName: $buyerName, buyerMobile: $buyerMobile, province: $province, city: $city, driverName: $driverName, driverMobile: $driverMobile, typeCar: $typeCar, pelak: $pelak, clearanceCode: $clearanceCode, numberOfCarcasses: $numberOfCarcasses, weightOfCarcasses: $weightOfCarcasses, date: $date, temporaryTrash: $temporaryTrash, temporaryDeleted: $temporaryDeleted, createdBy: $createdBy, modifiedBy: $modifiedBy, quota: $quota, saleType: $saleType, steward: $steward, guild: $guild, product: $product)'; } @@ -307,7 +311,7 @@ abstract mixin class _$StewardFreeSaleBarCopyWith<$Res> implements $StewardFreeS factory _$StewardFreeSaleBarCopyWith(_StewardFreeSaleBar value, $Res Function(_StewardFreeSaleBar) _then) = __$StewardFreeSaleBarCopyWithImpl; @override @useResult $Res call({ - int? id, Buyer? buyer, String? key, String? createDate, String? modifyDate, bool? trash, String? buyerName, String? buyerMobile, String? province, String? city, String? driverName, String? driverMobile, String? typeCar, String? pelak, String? clearanceCode, int? numberOfCarcasses, double? weightOfCarcasses, String? date, bool? temporaryTrash, bool? temporaryDeleted, String? createdBy, String? modifiedBy, dynamic steward, dynamic guild, dynamic product + int? id, Buyer? buyer, String? key, String? createDate, String? modifyDate, bool? trash, String? buyerName, String? buyerMobile, String? province, String? city, String? driverName, String? driverMobile, String? typeCar, String? pelak, String? clearanceCode, int? numberOfCarcasses, double? weightOfCarcasses, String? date, bool? temporaryTrash, bool? temporaryDeleted, String? createdBy, String? modifiedBy, String? quota, String? saleType, dynamic steward, dynamic guild, dynamic product }); @@ -324,7 +328,7 @@ class __$StewardFreeSaleBarCopyWithImpl<$Res> /// Create a copy of StewardFreeSaleBar /// with the given fields replaced by the non-null parameter values. -@override @pragma('vm:prefer-inline') $Res call({Object? id = freezed,Object? buyer = freezed,Object? key = freezed,Object? createDate = freezed,Object? modifyDate = freezed,Object? trash = freezed,Object? buyerName = freezed,Object? buyerMobile = freezed,Object? province = freezed,Object? city = freezed,Object? driverName = freezed,Object? driverMobile = freezed,Object? typeCar = freezed,Object? pelak = freezed,Object? clearanceCode = freezed,Object? numberOfCarcasses = freezed,Object? weightOfCarcasses = freezed,Object? date = freezed,Object? temporaryTrash = freezed,Object? temporaryDeleted = freezed,Object? createdBy = freezed,Object? modifiedBy = freezed,Object? steward = freezed,Object? guild = freezed,Object? product = freezed,}) { +@override @pragma('vm:prefer-inline') $Res call({Object? id = freezed,Object? buyer = freezed,Object? key = freezed,Object? createDate = freezed,Object? modifyDate = freezed,Object? trash = freezed,Object? buyerName = freezed,Object? buyerMobile = freezed,Object? province = freezed,Object? city = freezed,Object? driverName = freezed,Object? driverMobile = freezed,Object? typeCar = freezed,Object? pelak = freezed,Object? clearanceCode = freezed,Object? numberOfCarcasses = freezed,Object? weightOfCarcasses = freezed,Object? date = freezed,Object? temporaryTrash = freezed,Object? temporaryDeleted = freezed,Object? createdBy = freezed,Object? modifiedBy = freezed,Object? quota = freezed,Object? saleType = freezed,Object? steward = freezed,Object? guild = freezed,Object? product = freezed,}) { return _then(_StewardFreeSaleBar( id: freezed == id ? _self.id : id // ignore: cast_nullable_to_non_nullable as int?,buyer: freezed == buyer ? _self.buyer : buyer // ignore: cast_nullable_to_non_nullable @@ -348,6 +352,8 @@ as String?,temporaryTrash: freezed == temporaryTrash ? _self.temporaryTrash : te as bool?,temporaryDeleted: freezed == temporaryDeleted ? _self.temporaryDeleted : temporaryDeleted // ignore: cast_nullable_to_non_nullable as bool?,createdBy: freezed == createdBy ? _self.createdBy : createdBy // ignore: cast_nullable_to_non_nullable as String?,modifiedBy: freezed == modifiedBy ? _self.modifiedBy : modifiedBy // ignore: cast_nullable_to_non_nullable +as String?,quota: freezed == quota ? _self.quota : quota // ignore: cast_nullable_to_non_nullable +as String?,saleType: freezed == saleType ? _self.saleType : saleType // ignore: cast_nullable_to_non_nullable as String?,steward: freezed == steward ? _self.steward : steward // ignore: cast_nullable_to_non_nullable as dynamic,guild: freezed == guild ? _self.guild : guild // ignore: cast_nullable_to_non_nullable as dynamic,product: freezed == product ? _self.product : product // ignore: cast_nullable_to_non_nullable diff --git a/packages/chicken/lib/data/models/response/steward_free_sale_bar/steward_free_sale_bar.g.dart b/packages/chicken/lib/data/models/response/steward_free_sale_bar/steward_free_sale_bar.g.dart index e8feabc..06fdbd1 100644 --- a/packages/chicken/lib/data/models/response/steward_free_sale_bar/steward_free_sale_bar.g.dart +++ b/packages/chicken/lib/data/models/response/steward_free_sale_bar/steward_free_sale_bar.g.dart @@ -32,6 +32,8 @@ _StewardFreeSaleBar _$StewardFreeSaleBarFromJson(Map json) => temporaryDeleted: json['temporary_deleted'] as bool?, createdBy: json['created_by'] as String?, modifiedBy: json['modified_by'] as String?, + quota: json['quota'] as String?, + saleType: json['sale_type'] as String?, steward: json['steward'], guild: json['guild'], product: json['product'], @@ -61,6 +63,8 @@ Map _$StewardFreeSaleBarToJson(_StewardFreeSaleBar instance) => 'temporary_deleted': instance.temporaryDeleted, 'created_by': instance.createdBy, 'modified_by': instance.modifiedBy, + 'quota': instance.quota, + 'sale_type': instance.saleType, 'steward': instance.steward, 'guild': instance.guild, 'product': instance.product, diff --git a/packages/chicken/lib/data/repositories/chicken/chicken_repository.dart b/packages/chicken/lib/data/repositories/chicken/chicken_repository.dart index b2059c5..f76ff11 100644 --- a/packages/chicken/lib/data/repositories/chicken/chicken_repository.dart +++ b/packages/chicken/lib/data/repositories/chicken/chicken_repository.dart @@ -109,7 +109,15 @@ abstract class ChickenRepository { required CreateStewardFreeBar body, }); - Future editStewardPurchasesOutSideOfTheProvince({ + + Future editStewardPurchasesOutSideOfTheProvince({ + required String token, + required CreateStewardFreeBar body, + }); + + + + Future deleteStewardPurchasesOutSideOfTheProvince({ required String token, Map? queryParameters, }); @@ -143,6 +151,13 @@ abstract class ChickenRepository { required StewardFreeSaleBarRequest body, }); + Future deleteOutProvinceStewardFreeBar({ + required String token, + required String key + }); + + + Future getUserProfile({required String token}); Future updateUserProfile({required String token, required UserProfile userProfile}); diff --git a/packages/chicken/lib/data/repositories/chicken/chicken_repository_imp.dart b/packages/chicken/lib/data/repositories/chicken/chicken_repository_imp.dart index 089b62d..0073c12 100644 --- a/packages/chicken/lib/data/repositories/chicken/chicken_repository_imp.dart +++ b/packages/chicken/lib/data/repositories/chicken/chicken_repository_imp.dart @@ -223,13 +223,24 @@ class ChickenRepositoryImp implements ChickenRepository { } @override - Future editStewardPurchasesOutSideOfTheProvince({ + Future editStewardPurchasesOutSideOfTheProvince({ + required String token, + required CreateStewardFreeBar body, + }) async { + return await remote.editStewardPurchasesOutSideOfTheProvince( + token: token, + queryParameters: body.toJson()..removeWhere((key, value) => value == null), + ); + } + + @override + Future deleteStewardPurchasesOutSideOfTheProvince({ required String token, Map? queryParameters, }) async { - await remote.editStewardPurchasesOutSideOfTheProvince( + await remote.deleteStewardPurchasesOutSideOfTheProvince( token: token, - queryParameters: queryParameters + queryParameters: queryParameters, ); } @@ -278,6 +289,11 @@ class ChickenRepositoryImp implements ChickenRepository { await remote.updateOutProvinceStewardFreeBar(token: token, body: body); } + @override + Future deleteOutProvinceStewardFreeBar({required String token, required String key}) async { + await remote.deleteOutProvinceStewardFreeBar(token: token, key: key); + } + @override Future getUserProfile({required String token}) async { var res = await remote.getUserProfile(token: token); diff --git a/packages/chicken/lib/presentation/pages/steward/buy_out_of_province/logic.dart b/packages/chicken/lib/presentation/pages/steward/buy_out_of_province/logic.dart index 0773740..73ad0fe 100644 --- a/packages/chicken/lib/presentation/pages/steward/buy_out_of_province/logic.dart +++ b/packages/chicken/lib/presentation/pages/steward/buy_out_of_province/logic.dart @@ -31,6 +31,7 @@ class BuyOutOfProvinceLogic extends GetxController { Rxn selectedImage = Rxn(); RxnString _base64Image = RxnString(); RxnString editImageUrl = RxnString(); + RxnString editFreeBarKey = RxnString(); StewardRootLogic rootLogic = Get.find(); @@ -172,7 +173,7 @@ class BuyOutOfProvinceLogic extends GetxController { selectedProvince.value != null && selectedCity.value != null && selectedProduct.value != null && - selectedImage.value != null; + (selectedImage.value != null || editImageUrl.value != null); if (isSubmitButtonEnabled.value) { isOnLoadingSubmitOrEdit.value = false; @@ -196,6 +197,7 @@ class BuyOutOfProvinceLogic extends GetxController { province: selectedProvince.value!.name, city: selectedCity.value!.name, weightOfCarcasses: int.parse(carcassWeightController.text.clearComma), + numberOfCarcasses: int.parse(carcassCountController.text.clearComma), barImage: _base64Image.value, date: DateTime.now().formattedYHMS, ); @@ -228,42 +230,56 @@ class BuyOutOfProvinceLogic extends GetxController { isSubmitButtonEnabled.value = false; } - void setEditData(StewardFreeBar item) { + void setEditData(StewardFreeBar item) async { editImageUrl.value = item.barImage; sellerNameController.text = item.killHouseName ?? ''; sellerPhoneController.text = item.killHouseMobile ?? ''; - carcassWeightController.text = item.weightOfCarcasses?.toInt().toString() ?? ''; + carcassWeightController.text = item.weightOfCarcasses.separatedByComma; + carcassCountController.text = item.numberOfCarcasses.separatedByComma; + editFreeBarKey.value = item.key; selectedProvince.value = IranProvinceCityModel(name: item.province); selectedCity.value = IranProvinceCityModel(name: item.city); selectedProduct.value = rootLogic.rolesProductsModel.firstWhere( (element) => element.key == item.product!.key, ); + isSubmitButtonEnabled.value = true; } - Future editStewardPurchaseOutOfProvince(StewardFreeBar item) async { + Future editStewardPurchaseOutOfProvince() async { CreateStewardFreeBar edit = CreateStewardFreeBar( productKey: selectedProduct.value!.key, + key: editFreeBarKey.value, killHouseName: sellerNameController.text, killHouseMobile: sellerPhoneController.text, province: selectedProvince.value!.name, city: selectedCity.value!.name, weightOfCarcasses: int.parse(carcassWeightController.text.clearComma), - barImage: _base64Image.value, + numberOfCarcasses: int.parse(carcassCountController.text.clearComma), date: DateTime.now().formattedYHMS, ); + if (_base64Image.value != null) { + edit = edit.copyWith(barImage: _base64Image.value); + } + await safeCall( + showError: true, call: () => rootLogic.chickenRepository.editStewardPurchasesOutSideOfTheProvince( token: rootLogic.tokenService.accessToken.value!, - queryParameters: buildRawQueryParams(queryParams: {'key': key}), + body: edit, ), + onSuccess: (result) { + onRefresh(); + rootLogic.onRefresh(); + toggleExpansion(); + }, ); } Future deleteStewardPurchaseOutOfProvince(String key) async { await safeCall( - call: () => rootLogic.chickenRepository.editStewardPurchasesOutSideOfTheProvince( + call: () => rootLogic.chickenRepository.deleteStewardPurchasesOutSideOfTheProvince( token: rootLogic.tokenService.accessToken.value!, queryParameters: buildRawQueryParams(queryParams: {'key': key}), ), @@ -278,9 +294,9 @@ class BuyOutOfProvinceLogic extends GetxController { void toggleExpansion({int? index}) { if (expandedListIndex.value == index || index == null) { - expandedListIndex.value = -1; // Collapse if the same index is tapped + expandedListIndex.value = -1; } else { - expandedListIndex.value = index; // Expand the new index + expandedListIndex.value = index; } } } diff --git a/packages/chicken/lib/presentation/pages/steward/buy_out_of_province/view.dart b/packages/chicken/lib/presentation/pages/steward/buy_out_of_province/view.dart index 5464419..60d1f74 100644 --- a/packages/chicken/lib/presentation/pages/steward/buy_out_of_province/view.dart +++ b/packages/chicken/lib/presentation/pages/steward/buy_out_of_province/view.dart @@ -218,10 +218,12 @@ class BuyOutOfProvincePage extends GetView { onPressed: () { buildDeleteDialog( onConfirm: () => controller.deleteStewardPurchaseOutOfProvince(item.key!), - onRefresh: () => controller.getStewardPurchaseOutOfProvince(), - ).then((value) { - controller.onRefresh(); - }); + onRefresh: () async { + controller.rootLogic.onRefresh(); + controller.onRefresh(); + controller.toggleExpansion(); + }, + ); }, borderColor: AppColor.redNormal, ), @@ -409,14 +411,18 @@ class BuyOutOfProvincePage extends GetView { width: Get.width, backgroundColor: AppColor.greenNormal, isLoading: controller.isOnLoadingSubmitOrEdit.value, - onPressed: controller.isSubmitButtonEnabled.value + enabled: controller.isSubmitButtonEnabled.value, + onPressed: isOnEdit ? () async { + var res = await controller.editStewardPurchaseOutOfProvince(); + Get.back(); + } + : () async { var res = await controller.createStewardPurchaseOutOfProvince(); if (res) { Get.back(); } - } - : null, + }, height: 40, ); }); diff --git a/packages/chicken/lib/presentation/pages/steward/sales_in_province/logic.dart b/packages/chicken/lib/presentation/pages/steward/sales_in_province/logic.dart index 7609ddc..8f2c37e 100644 --- a/packages/chicken/lib/presentation/pages/steward/sales_in_province/logic.dart +++ b/packages/chicken/lib/presentation/pages/steward/sales_in_province/logic.dart @@ -18,7 +18,7 @@ class SalesInProvinceLogic extends GetxController { StewardRootLogic rootLogic = Get.find(); SaleLogic saleLogic = Get.find(); RxnString searchedValue = RxnString(); - RxList isExpandedList = [].obs; + RxInt expandedListIndex = (-1).obs; RxList routesName = RxList(); Rx bgConfirmAllColor = AppColor.blueNormal.obs; final RxBool isLoadingMoreAllocationsMade = false.obs; @@ -33,12 +33,8 @@ class SalesInProvinceLogic extends GetxController { GlobalKey formKey = GlobalKey(); - Rx fromDateFilter = Jalali - .now() - .obs; - Rx toDateFilter = Jalali - .now() - .obs; + Rx fromDateFilter = Jalali.now().obs; + Rx toDateFilter = Jalali.now().obs; Rxn selectedProductModel = Rxn(); Rxn selectedGuildModel = Rxn(); Rxn guildProfile = Rxn(); @@ -84,16 +80,14 @@ class SalesInProvinceLogic extends GetxController { }); totalCost.listen((data) { - totalCostController.text = data - .toString() - .separatedByComma; + totalCostController.text = data.toString().separatedByComma; isValid.value = weight.value > 0 && - pricePerKilo.value > 0 && - totalCost.value > 0 && - selectedProductModel.value != null && - selectedGuildModel.value != null; + pricePerKilo.value > 0 && + totalCost.value > 0 && + selectedProductModel.value != null && + selectedGuildModel.value != null; }); everAll([ totalCost, @@ -114,7 +108,7 @@ class SalesInProvinceLogic extends GetxController { debounce( searchedValue, - (callback) => getAllocatedMade(), + (callback) => getAllocatedMade(), time: Duration(milliseconds: timeDebounce), ); } @@ -133,8 +127,7 @@ class SalesInProvinceLogic extends GetxController { } safeCall( - call: () async => - await rootLogic.chickenRepository.getAllocatedMade( + call: () async => await rootLogic.chickenRepository.getAllocatedMade( token: rootLogic.tokenService.accessToken.value!, queryParameters: buildQueryParams( page: currentPage.value, @@ -176,16 +169,15 @@ class SalesInProvinceLogic extends GetxController { void checkVerification() { isValid.value = weight.value > 0 && - pricePerKilo.value > 0 && - totalCost.value > 0 && - selectedProductModel.value != null && - selectedGuildModel.value != null; + pricePerKilo.value > 0 && + totalCost.value > 0 && + selectedProductModel.value != null && + selectedGuildModel.value != null; } void confirmAllocation(ConformAllocation allocation) { safeCall( - call: () async => - await rootLogic.chickenRepository.confirmAllocation( + call: () async => await rootLogic.chickenRepository.confirmAllocation( token: rootLogic.tokenService.accessToken.value!, allocation: allocation.toJson(), ), @@ -198,8 +190,7 @@ class SalesInProvinceLogic extends GetxController { void denyAllocation(String token) { safeCall( - call: () async => - await rootLogic.chickenRepository.denyAllocation( + call: () async => await rootLogic.chickenRepository.denyAllocation( token: rootLogic.tokenService.accessToken.value!, allocationToken: token, ), @@ -212,8 +203,7 @@ class SalesInProvinceLogic extends GetxController { Future confirmAllAllocations() async { safeCall( - call: () async => - await rootLogic.chickenRepository.confirmAllAllocation( + call: () async => await rootLogic.chickenRepository.confirmAllAllocation( token: rootLogic.tokenService.accessToken.value!, allocationTokens: allocatedList.value.data?.results?.map((e) => e.key!).toList() ?? [], ), @@ -226,8 +216,7 @@ class SalesInProvinceLogic extends GetxController { Future getRolesProducts() async { safeCall( - call: () async => - await rootLogic.chickenRepository.getRolesProducts( + call: () async => await rootLogic.chickenRepository.getRolesProducts( token: rootLogic.tokenService.accessToken.value!, ), onSuccess: (result) { @@ -242,8 +231,7 @@ class SalesInProvinceLogic extends GetxController { Future getGuilds() async { safeCall( - call: () async => - await rootLogic.chickenRepository.getGuilds( + call: () async => await rootLogic.chickenRepository.getGuilds( token: rootLogic.tokenService.accessToken.value!, queryParameters: buildQueryParams( queryParams: {'free': saleType.value == 2 ? true : false}, @@ -274,8 +262,7 @@ class SalesInProvinceLogic extends GetxController { Future getGuildProfile() async { await safeCall( - call: () async => - await rootLogic.chickenRepository.getProfile( + call: () async => await rootLogic.chickenRepository.getProfile( token: rootLogic.tokenService.accessToken.value!, ), onError: (error, stackTrace) {}, @@ -289,8 +276,7 @@ class SalesInProvinceLogic extends GetxController { tmpStewardAllocation = SubmitStewardAllocation( approvedPriceStatus: broadcastPrice.value?.active ?? false, allocationType: - '${guildProfile.value?.steward == true ? "steward" : "guild"}_${selectedGuildModel.value - ?.steward == true ? "steward" : "guild"}', + '${guildProfile.value?.steward == true ? "steward" : "guild"}_${selectedGuildModel.value?.steward == true ? "steward" : "guild"}', sellerType: guildProfile.value?.steward == true ? "Steward" : "Guild", buyerType: selectedGuildModel.value?.steward == true ? "Steward" : "Guild", amount: pricePerKilo.value, @@ -301,23 +287,25 @@ class SalesInProvinceLogic extends GetxController { quota: quotaType.value == 1 ? 'governmental' : 'free', guildKey: selectedGuildModel.value?.key, productKey: selectedProductModel.value?.key, - date: DateTime - .now() - .formattedDashedGregorian, + date: DateTime.now().formattedDashedGregorian, type: "manual", ); } Future submitAllocation() async { + setSubmitData(); + safeCall( - call: () async => - await rootLogic.chickenRepository.postSubmitStewardAllocation( + showError: true, + call: () async => await rootLogic.chickenRepository.postSubmitStewardAllocation( token: rootLogic.tokenService.accessToken.value!, request: tmpStewardAllocation!, ), onSuccess: (result) { - getAllocatedMade(); + clearForm(); + onRefresh(); + rootLogic.onRefresh(); }, onError: (error, stackTrace) {}, ); @@ -325,8 +313,7 @@ class SalesInProvinceLogic extends GetxController { Future deleteAllocation(AllocatedMadeModel model) async { safeCall( - call: () async => - await rootLogic.chickenRepository.deleteStewardAllocation( + call: () async => await rootLogic.chickenRepository.deleteStewardAllocation( token: rootLogic.tokenService.accessToken.value!, queryParameters: {'steward_allocation_key': model.key}, ), @@ -352,15 +339,9 @@ class SalesInProvinceLogic extends GetxController { weight.value = item.weightOfCarcasses ?? 0; pricePerKilo.value = item.amount ?? 0; totalCost.value = item.totalAmount ?? 0; - weightController.text = weight.value - .toString() - .separatedByComma; - pricePerKiloController.text = pricePerKilo.value - .toString() - .separatedByComma; - totalCostController.text = totalCost.value - .toString() - .separatedByComma; + weightController.text = weight.value.toString().separatedByComma; + pricePerKiloController.text = pricePerKilo.value.toString().separatedByComma; + totalCostController.text = totalCost.value.toString().separatedByComma; isValid.value = true; } @@ -389,14 +370,16 @@ class SalesInProvinceLogic extends GetxController { ); safeCall( - call: () async => - await rootLogic.chickenRepository.updateStewardAllocation( + showError: true, + call: () async => await rootLogic.chickenRepository.updateStewardAllocation( token: rootLogic.tokenService.accessToken.value!, request: updatedAllocationModel, ), onSuccess: (result) { - getAllocatedMade(); + clearForm(); + onRefresh(); + rootLogic.onRefresh(); }, onError: (error, stackTrace) {}, ); @@ -434,17 +417,14 @@ class SalesInProvinceLogic extends GetxController { Future getBroadcastPrice() async { safeCall( - call: () async => - await rootLogic.chickenRepository.getBroadcastPrice( + call: () async => await rootLogic.chickenRepository.getBroadcastPrice( token: rootLogic.tokenService.accessToken.value!, ), onSuccess: (result) { broadcastPrice.value = result; if (broadcastPrice.value?.active == true) { pricePerKilo.value = broadcastPrice.value?.stewardPrice ?? 0; - pricePerKiloController.text = pricePerKilo.value - .toString() - .separatedByComma; + pricePerKiloController.text = pricePerKilo.value.toString().separatedByComma; } }, onError: (error, stacktrace) {}, @@ -452,9 +432,17 @@ class SalesInProvinceLogic extends GetxController { } Future onRefresh() async { + toggleExpansion(); currentPage.value = 1; hasMoreDataAllocationsMade.value = true; - await rootLogic.onRefresh(); - await Future.wait([getAllocatedMade()]); + await Future.wait([getAllocatedMade(), rootLogic.onRefresh()]); + } + + void toggleExpansion({int? index}) { + if (expandedListIndex.value == index || index == null) { + expandedListIndex.value = -1; + } else { + expandedListIndex.value = index; + } } } diff --git a/packages/chicken/lib/presentation/pages/steward/sales_in_province/view.dart b/packages/chicken/lib/presentation/pages/steward/sales_in_province/view.dart index 179773e..2d26b0d 100644 --- a/packages/chicken/lib/presentation/pages/steward/sales_in_province/view.dart +++ b/packages/chicken/lib/presentation/pages/steward/sales_in_province/view.dart @@ -47,8 +47,8 @@ class SalesInProvincePage extends GetView { var item = data.value.data!.results![index]; return ObxValue((val) { return ExpandableListItem2( - selected: val.contains(index), - onTap: () => controller.isExpandedList.toggle(index), + selected: val.value == index, + onTap: () => controller.toggleExpansion(index: index), index: index, child: itemListWidget(item), secondChild: itemListExpandedWidget(item, index), @@ -58,7 +58,7 @@ class SalesInProvincePage extends GetView { ? AppColor.darkGreyDark : AppColor.error, ); - }, controller.isExpandedList); + }, controller.expandedListIndex); }, itemCount: data.value.data?.results?.length ?? 0, separatorBuilder: (context, index) => SizedBox(height: 8.h), @@ -353,7 +353,7 @@ class SalesInProvincePage extends GetView { onPressed: () { buildDeleteDialog( onConfirm: () async { - controller.isExpandedList.remove(index); + controller.toggleExpansion(index: index); await controller.deleteAllocation(item); }, @@ -372,7 +372,7 @@ class SalesInProvincePage extends GetView { Widget addOrEditBottomSheet([bool isEditMode = false]) { return BaseBottomSheet( - height: Get.height * (isEditMode ? 0.45 : 0.75), + height: Get.height * (isEditMode ? 0.55 : 0.75), child: Form( key: controller.formKey, child: Column( @@ -526,7 +526,7 @@ class SalesInProvincePage extends GetView { SizedBox(width: 30.w), Radio(value: 2), - Text('فروش آزاد', style: AppFonts.yekan14), + Text('انبار آزاد', style: AppFonts.yekan14), ], ), ); @@ -576,22 +576,16 @@ class SalesInProvincePage extends GetView { textStyle: AppFonts.yekan16.copyWith(color: Colors.white), backgroundColor: AppColor.greenNormal, height: 40, - onPressed: data.value + enabled: data.value, + onPressed: isEditMode ? () async { - if (isEditMode) { - await controller.updateAllocation(); - controller.clearForm(); - controller.getAllocatedMade(); - controller.rootLogic.getInventory(); - Get.back(); - } else { - if (controller.formKey.currentState?.validate() ?? false) { - controller.setSubmitData(); - await Get.bottomSheet(show2StepAddBottomSheet()); - } - } + await controller.updateAllocation(); + Get.back(); } - : null, + : () async { + await controller.submitAllocation(); + Get.back(); + }, ); }, controller.isValid), ], diff --git a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province/logic.dart b/packages/chicken/lib/presentation/pages/steward/sales_out_of_province/logic.dart index c9a5adf..3117c9c 100644 --- a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province/logic.dart +++ b/packages/chicken/lib/presentation/pages/steward/sales_out_of_province/logic.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; - import 'package:rasadyar_chicken/data/models/request/steward_free_sale_bar/steward_free_sale_bar_request.dart'; import 'package:rasadyar_chicken/data/models/response/iran_province_city/iran_province_city_model.dart'; import 'package:rasadyar_chicken/data/models/response/out_province_carcasses_buyer/out_province_carcasses_buyer.dart'; @@ -13,21 +12,18 @@ import 'package:rasadyar_chicken/presentation/utils/utils.dart'; import 'package:rasadyar_core/core.dart'; class SalesOutOfProvinceLogic extends GetxController { - StewardRootLogic rootLogic = Get.find(); + StewardRootLogic rootLogic = Get.find(); - SaleLogic saleLogic = Get.find(); + SaleLogic saleLogic = Get.find(); + SalesOutOfProvinceSalesListLogic saleListLogic = Get.find(); - - SalesOutOfProvinceSalesListLogic get saleListLogic => - Get.find(); - - SalesOutOfProvinceBuyersLogic buyerLogic = Get.find(); + SalesOutOfProvinceBuyersLogic buyerLogic = Get.find(); RxBool isExpanded = false.obs; RxInt currentPage = 1.obs; RxBool isSaleSubmitButtonEnabled = false.obs; - RxList isExpandedList = [].obs; + RxInt expandedListIndex = (-1).obs; Rx fromDateFilter = Jalali.now().obs; Rx toDateFilter = Jalali.now().obs; RxnString searchedValue = RxnString(); @@ -35,10 +31,10 @@ class SalesOutOfProvinceLogic extends GetxController { RxBool isLoadingMoreAllocationsMade = false.obs; Rxn selectedCity = Rxn(); - GlobalKey formKey = GlobalKey(); TextEditingController quarantineCodeController = TextEditingController(); TextEditingController saleWeightController = TextEditingController(); + TextEditingController saleCountController = TextEditingController(); Rx saleDate = Jalali.now().obs; String? key; @@ -48,6 +44,9 @@ class SalesOutOfProvinceLogic extends GetxController { Rxn selectedProduct = Rxn(); Rxn selectedBuyer = Rxn(); + RxInt saleType = 2.obs; + RxInt quotaType = 1.obs; + @override void onInit() { super.onInit(); @@ -119,6 +118,12 @@ class SalesOutOfProvinceLogic extends GetxController { void setupListeners() { saleWeightController.addListener(checkSalesFormValid); quarantineCodeController.addListener(checkSalesFormValid); + saleWeightController.addListener(() { + checkSalesFormValid(); + var weight = int.parse(saleWeightController.text.clearComma); + var res = (weight / selectedProduct.value!.weightAverage!.toInt()).round(); + saleCountController.text = res.separatedByComma; + }); ever(selectedBuyer, (_) => checkSalesFormValid); ever(selectedProduct, (_) => checkSalesFormValid); ever(saleDate, (_) => checkSalesFormValid()); @@ -143,14 +148,16 @@ class SalesOutOfProvinceLogic extends GetxController { ); selectedProduct.value = rootLogic.rolesProductsModel.first; key = item.key; + saleType.value = item.saleType == 'free' ? 2 : 1; + quotaType.value = item.quota == 'governmental' ? 1 : 2; isSaleSubmitButtonEnabled.value = true; } Future deleteStewardPurchaseOutOfProvince(String key) async { await safeCall( - call: () => rootLogic.chickenRepository.editStewardPurchasesOutSideOfTheProvince( + call: () => rootLogic.chickenRepository.deleteOutProvinceStewardFreeBar( token: rootLogic.tokenService.accessToken.value!, - stewardFreeBarKey: key, + key: key, ), ); } @@ -159,19 +166,24 @@ class SalesOutOfProvinceLogic extends GetxController { bool res = false; StewardFreeSaleBarRequest requestBody = StewardFreeSaleBarRequest( buyerKey: selectedBuyer.value?.key, - numberOfCarcasses: 0, + numberOfCarcasses: int.tryParse(saleCountController.text.clearComma), weightOfCarcasses: int.tryParse(saleWeightController.text.clearComma), date: saleDate.value.toDateTime().formattedDashedGregorian, clearanceCode: quarantineCodeController.text, productKey: selectedProduct.value?.key, + saleType: saleType.value == 2 ? 'free' : 'exclusive', + quota: quotaType.value == 1 ? 'governmental' : 'free', ); await safeCall( + showError: true, call: () => rootLogic.chickenRepository.createOutProvinceStewardFreeBar( token: rootLogic.tokenService.accessToken.value!, body: requestBody, ), onSuccess: (_) { res = true; + onRefresh(); + rootLogic.onRefresh(); }, ); return res; @@ -181,8 +193,9 @@ class SalesOutOfProvinceLogic extends GetxController { quarantineCodeController.clear(); saleWeightController.clear(); saleDate.value = Jalali.now(); + saleType.value = 2; + quotaType.value = 1; selectedBuyer.value = null; - selectedProduct.value = null; } Future editSale() async { @@ -192,6 +205,8 @@ class SalesOutOfProvinceLogic extends GetxController { weightOfCarcasses: int.tryParse(saleWeightController.text.clearComma), date: saleDate.value.toDateTime().formattedDashedGregorian, clearanceCode: quarantineCodeController.text, + saleType: saleType.value == 2 ? 'free' : 'exclusive', + quota: quotaType.value == 1 ? 'governmental' : 'free', key: key, ); await safeCall( @@ -201,6 +216,7 @@ class SalesOutOfProvinceLogic extends GetxController { ), onSuccess: (_) { res = true; + onRefresh(); }, ); return res; @@ -208,16 +224,23 @@ class SalesOutOfProvinceLogic extends GetxController { void resetSubmitForm() { selectedCity.value = null; - selectedProduct.value = null; + key = null; } - Future onRefresh() async { currentPage.value = 1; + resetSubmitForm(); + clearSaleForm(); await rootLogic.onRefresh(); await getOutProvinceSales(); + } - + void toggleExpansion({int? index}) { + if (expandedListIndex.value == index || index == null) { + expandedListIndex.value = -1; + } else { + expandedListIndex.value = index; + } } } diff --git a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province/view.dart b/packages/chicken/lib/presentation/pages/steward/sales_out_of_province/view.dart index 6334f5a..9c10721 100644 --- a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province/view.dart +++ b/packages/chicken/lib/presentation/pages/steward/sales_out_of_province/view.dart @@ -44,15 +44,15 @@ class SalesOutOfProvincePage extends GetView { var item = data.value.data!.results![index]; return ObxValue((val) { return ExpandableListItem2( - selected: val.contains(index), - onTap: () => controller.isExpandedList.toggle(index), + selected: val.value == index, + onTap: () => controller.toggleExpansion(index: index), index: index, child: itemListWidget(item), secondChild: itemListExpandedWidget(item, index), labelColor: AppColor.blueLight, labelIcon: Assets.vec.timerSvg.path, ); - }, controller.isExpandedList); + }, controller.expandedListIndex); }, itemCount: data.value.data?.results?.length ?? 0, separatorBuilder: (context, index) => SizedBox(height: 8.h), @@ -69,7 +69,11 @@ class SalesOutOfProvincePage extends GetView { children: [ RFab.add( onPressed: () { - Get.bottomSheet(addOrEditSaleBottomSheet(), isScrollControlled: true); + Get.bottomSheet(addOrEditSaleBottomSheet(), isScrollControlled: true).then(( + value, + ) { + controller.clearSaleForm(); + }); }, ), Spacer(), @@ -245,9 +249,13 @@ class SalesOutOfProvincePage extends GetView { buildRow(title: 'تلفن خریدار', value: item.buyer?.mobile ?? 'N/A'), buildRow(title: 'نام واحد', value: item.buyer?.unitName ?? 'N/A'), buildRow( - title: 'وزن لاشه (ريال)', + title: 'وزن لاشه (کیلوگرم)', value: '${item.weightOfCarcasses?.separatedByCommaFa}', ), + buildRow( + title: 'حجم تقریبی لاشه (قطعه)', + value: '${item.numberOfCarcasses?.separatedByCommaFa}', + ), Row( mainAxisAlignment: MainAxisAlignment.center, @@ -277,10 +285,12 @@ class SalesOutOfProvincePage extends GetView { onPressed: () { buildDeleteDialog( onConfirm: () async { - controller.isExpandedList.remove(index); + controller.toggleExpansion(); controller.deleteStewardPurchaseOutOfProvince(item.key!); }, - onRefresh: () => controller.onRefresh(), + onRefresh: () async { + controller.onRefresh(); + }, ); }, borderColor: AppColor.redNormal, @@ -294,7 +304,7 @@ class SalesOutOfProvincePage extends GetView { Widget addOrEditSaleBottomSheet([bool isOnEdit = false]) { return BaseBottomSheet( - height: 500.h, + height: 600.h, child: SingleChildScrollView( child: Form( key: controller.formKey, @@ -331,7 +341,7 @@ class SalesOutOfProvincePage extends GetView { _buyerWidget(), RTextField( controller: controller.saleWeightController, - label: 'وزن لاشه', + label: 'وزن لاشه (کیلوگرم)', keyboardType: TextInputType.number, borderColor: AppColor.darkGreyLight, filledColor: AppColor.bgLight, @@ -348,6 +358,28 @@ class SalesOutOfProvincePage extends GetView { return null; }, ), + + RTextField( + controller: controller.saleCountController, + label: 'حجم تقریبی(قطعه)', + keyboardType: TextInputType.number, + borderColor: AppColor.darkGreyLight, + filledColor: AppColor.bgLight, + variant: RTextFieldVariant.noBorder, + filled: true, + enabled: false, + inputFormatters: [ + FilteringTextInputFormatter.digitsOnly, + SeparatorInputFormatter(), + ], + + validator: (value) { + if (value == null) { + return 'لطفاً قطعه لاشه را وارد کنید'; + } + return null; + }, + ), RTextField( controller: controller.quarantineCodeController, label: 'کد قرنطینه', @@ -361,10 +393,54 @@ class SalesOutOfProvincePage extends GetView { return null; }, ), - submitButtonWidget(isOnEdit), + + SizedBox( + height: 40, + child: ObxValue((data) { + return RadioGroup( + onChanged: (value) { + controller.saleType.value = value ?? 0; + }, + groupValue: controller.saleType.value, + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Radio(value: 1, enabled: false), + Text('فروش دولتی', style: AppFonts.yekan14), + SizedBox(width: 12), + Radio(value: 2, enabled: isOnEdit ? false : true), + Text('فروش آزاد', style: AppFonts.yekan14), + ], + ), + ); + }, controller.saleType), + ), + + SizedBox( + height: 40, + child: ObxValue((data) { + return RadioGroup( + onChanged: (value) { + controller.quotaType.value = value ?? 0; + }, + groupValue: controller.quotaType.value, + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Radio(value: 1, enabled: isOnEdit ? false : true), + Text('انبار دولتی', style: AppFonts.yekan14), + SizedBox(width: 12), + Radio(value: 2, enabled: isOnEdit ? false : true), + Text('انبار آزاد', style: AppFonts.yekan14), + ], + ), + ); + }, controller.saleType), + ), ], ), ), + submitButtonWidget(isOnEdit), SizedBox(), ], ), @@ -383,8 +459,6 @@ class SalesOutOfProvincePage extends GetView { ? () async { var res = isOnEdit ? await controller.editSale() : await controller.createSale(); if (res) { - controller.getOutProvinceSales(); - controller.clearSaleForm(); Get.back(); } } diff --git a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_buyers/logic.dart b/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_buyers/logic.dart index 1888f0a..45624e4 100644 --- a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_buyers/logic.dart +++ b/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_buyers/logic.dart @@ -16,7 +16,7 @@ class SalesOutOfProvinceBuyersLogic extends GetxController { SalesOutOfProvinceLogic get saleOutOfProvince => Get.find(); RxInt currentPage = 1.obs; - RxList isExpandedList = [].obs; + RxInt expandedListIndex = (-1).obs; Rx fromDateFilter = Jalali.now().obs; Rx toDateFilter = Jalali.now().obs; RxnString searchedValue = RxnString(); @@ -70,7 +70,7 @@ class SalesOutOfProvinceBuyersLogic extends GetxController { buyerUnitNameController.dispose(); selectedCity.value = null; selectedProvince.value = null; - isExpandedList.clear(); + super.onClose(); } @@ -215,4 +215,11 @@ class SalesOutOfProvinceBuyersLogic extends GetxController { await rootLogic.onRefresh(); await getOutProvinceCarcassesBuyer(); } + void toggleExpansion({int? index}) { + if (expandedListIndex.value == index || index == null) { + expandedListIndex.value = -1; + } else { + expandedListIndex.value = index; + } + } } diff --git a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_buyers/view.dart b/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_buyers/view.dart index fa4335d..4b509f1 100644 --- a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_buyers/view.dart +++ b/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_buyers/view.dart @@ -52,15 +52,15 @@ class SalesOutOfProvinceBuyersPage extends GetView controller.isExpandedList.toggle(index), + selected: val.value == index, + onTap: () => controller.toggleExpansion(), index: index, child: itemListWidget(item), secondChild: itemListExpandedWidget(item), labelColor: AppColor.blueLight, labelIcon: Assets.vec.userRaduisSvg.path, ); - }, controller.isExpandedList); + }, controller.expandedListIndex); }, itemCount: data.value.data?.results?.length ?? 0, separatorBuilder: (context, index) => SizedBox(height: 8.h), diff --git a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_sales_list/logic.dart b/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_sales_list/logic.dart index 5b60fb5..f10fedc 100644 --- a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_sales_list/logic.dart +++ b/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_sales_list/logic.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; - import 'package:rasadyar_chicken/data/models/request/steward_free_sale_bar/steward_free_sale_bar_request.dart'; import 'package:rasadyar_chicken/data/models/response/iran_province_city/iran_province_city_model.dart'; import 'package:rasadyar_chicken/data/models/response/out_province_carcasses_buyer/out_province_carcasses_buyer.dart'; @@ -12,18 +11,17 @@ import 'package:rasadyar_chicken/presentation/utils/utils.dart'; import 'package:rasadyar_core/core.dart'; class SalesOutOfProvinceSalesListLogic extends GetxController { - StewardRootLogic rootLogic = Get.find(); + StewardRootLogic rootLogic = Get.find(); - SaleLogic get saleLogic => Get.find(); + SaleLogic saleLogic = Get.find(); - SalesOutOfProvinceBuyersLogic get buyerLogic => - Get.find(); + SalesOutOfProvinceBuyersLogic buyerLogic = Get.find(); RxInt selectedSegmentIndex = 0.obs; RxBool isExpanded = false.obs; RxInt currentPage = 1.obs; RxBool isSaleSubmitButtonEnabled = false.obs; - RxList isExpandedList = [].obs; + RxInt expandedListIndex = (-1).obs; Rx fromDateFilter = Jalali.now().obs; Rx toDateFilter = Jalali.now().obs; RxnString searchedValue = RxnString(); @@ -34,9 +32,16 @@ class SalesOutOfProvinceSalesListLogic extends GetxController { //TODO add this to Di ImagePicker imagePicker = ImagePicker(); + + + RxInt saleType = 1.obs; + RxInt quotaType = 1.obs; + + GlobalKey formKey = GlobalKey(); TextEditingController quarantineCodeController = TextEditingController(); TextEditingController saleWeightController = TextEditingController(); + TextEditingController saleCountController = TextEditingController(); Rx saleDate = Jalali.now().obs; String? key; @@ -92,21 +97,16 @@ class SalesOutOfProvinceSalesListLogic extends GetxController { ), onSuccess: (res) { if ((res?.count ?? 0) == 0) { - salesList.value = - Resource>.empty(); + salesList.value = Resource>.empty(); } else { - salesList.value = - Resource>.success( - PaginationModel( - count: res?.count ?? 0, - next: res?.next, - previous: res?.previous, - results: [ - ...(salesList.value.data?.results ?? []), - ...(res?.results ?? []), - ], - ), - ); + salesList.value = Resource>.success( + PaginationModel( + count: res?.count ?? 0, + next: res?.next, + previous: res?.previous, + results: [...(salesList.value.data?.results ?? []), ...(res?.results ?? [])], + ), + ); isLoadingMoreAllocationsMade.value = false; } @@ -115,7 +115,7 @@ class SalesOutOfProvinceSalesListLogic extends GetxController { } void setupListeners() { - saleWeightController.addListener(checkSalesFormValid); + quarantineCodeController.addListener(checkSalesFormValid); ever(selectedBuyer, (_) => checkSalesFormValid); ever(selectedProduct, (_) => checkSalesFormValid); @@ -133,8 +133,7 @@ class SalesOutOfProvinceSalesListLogic extends GetxController { void setEditDataSales(StewardFreeSaleBar item) { quarantineCodeController.text = item.clearanceCode ?? ''; - saleWeightController.text = - item.weightOfCarcasses?.toInt().toString() ?? ''; + saleWeightController.text = item.weightOfCarcasses?.toInt().toString() ?? ''; saleDate.value = Jalali.fromDateTime(DateTime.parse(item.date!)); selectedCity.value = IranProvinceCityModel(name: item.city); selectedBuyer.value = buyerLogic.buyerList.value.data?.results?.firstWhere( @@ -146,21 +145,25 @@ class SalesOutOfProvinceSalesListLogic extends GetxController { } Future deleteStewardPurchaseOutOfProvince(String key) async { - await safeCall( + //todo + /* await safeCall( call: () => rootLogic.chickenRepository .editStewardPurchasesOutSideOfTheProvince( token: rootLogic.tokenService.accessToken.value!, stewardFreeBarKey: key, ), - ); + );*/ } Future createSale() async { bool res = false; + var tmpWight = int.tryParse(saleWeightController.text.clearComma); + var tmpCount = (tmpWight! / selectedProduct.value!.weightAverage!).round(); + StewardFreeSaleBarRequest requestBody = StewardFreeSaleBarRequest( buyerKey: selectedBuyer.value?.key, - numberOfCarcasses: 0, - weightOfCarcasses: int.tryParse(saleWeightController.text.clearComma), + numberOfCarcasses: tmpCount, + weightOfCarcasses: tmpWight, date: saleDate.value.toDateTime().formattedDashedGregorian, clearanceCode: quarantineCodeController.text, productKey: selectedProduct.value?.key, @@ -211,4 +214,11 @@ class SalesOutOfProvinceSalesListLogic extends GetxController { selectedProduct.value = null; key = null; } + void toggleExpansion({int? index}) { + if (expandedListIndex.value == index || index == null) { + expandedListIndex.value = -1; + } else { + expandedListIndex.value = index; + } + } } diff --git a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_sales_list/view.dart b/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_sales_list/view.dart index 5d96d07..8b96b83 100644 --- a/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_sales_list/view.dart +++ b/packages/chicken/lib/presentation/pages/steward/sales_out_of_province_sales_list/view.dart @@ -5,8 +5,6 @@ import 'package:rasadyar_chicken/data/models/response/out_province_carcasses_buy import 'package:rasadyar_chicken/data/models/response/roles_products/roles_products.dart'; import 'package:rasadyar_chicken/data/models/response/steward_free_sale_bar/steward_free_sale_bar.dart'; import 'package:rasadyar_chicken/presentation/routes/routes.dart'; -import 'package:rasadyar_chicken/presentation/widget/list_item/list_item.dart' hide ListItem2; - import 'package:rasadyar_core/core.dart'; import 'logic.dart'; @@ -29,15 +27,15 @@ class SalesOutOfProvinceSalesListPage extends GetView controller.isExpandedList.toggle(index), + selected: val.value == index, + onTap: () => controller.toggleExpansion(), index: index, child: itemListWidget(item), secondChild: itemListExpandedWidget(item, index), labelColor: AppColor.blueLight, labelIcon: Assets.vec.timerSvg.path, ); - }, controller.isExpandedList); + }, controller.expandedListIndex); }, itemCount: data.value.data?.results?.length ?? 0, separatorBuilder: (context, index) => SizedBox(height: 8.h), @@ -227,7 +225,7 @@ class SalesOutOfProvinceSalesListPage extends GetView controller.getOutProvinceSales(), @@ -298,6 +296,26 @@ class SalesOutOfProvinceSalesListPage extends GetView