Add better support for user profile fields for addresses to the Cart and the EMS.
This commit is contained in:
Colin Kuskie
parent
39049e1c7c
commit
428ea58327
21 changed files with 1657 additions and 62 deletions
|
|
@ -141,6 +141,7 @@ cmp_deeply(
|
|||
organization => undef,
|
||||
addressId => ignore(), #checked elsewhere
|
||||
addressBookId => $book->getId,
|
||||
isProfile => 0,
|
||||
},
|
||||
'get the whole thing and check a new, blank object'
|
||||
);
|
||||
|
|
|
|||
|
|
@ -23,15 +23,21 @@ use Exception::Class;
|
|||
use WebGUI::Test; # Must use this before any other WebGUI modules
|
||||
use WebGUI::Session;
|
||||
use WebGUI::Text;
|
||||
use JSON;
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Init
|
||||
my $session = WebGUI::Test->session;
|
||||
#Create a temporary admin user
|
||||
my $tempAdmin = WebGUI::User->create($session);
|
||||
$tempAdmin->addToGroups(['3']);
|
||||
WebGUI::Test->addToCleanup($tempAdmin);
|
||||
$session->user({ userId => $tempAdmin->getId} );
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# Tests
|
||||
|
||||
plan tests => 26;
|
||||
plan tests => 42;
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# put your tests here
|
||||
|
|
@ -114,7 +120,7 @@ cmp_deeply(
|
|||
'... correct error message',
|
||||
);
|
||||
|
||||
$session->user({userId => 3});
|
||||
$session->user({userId => $tempAdmin->getId});
|
||||
$book = WebGUI::Shop::AddressBook->create($session);
|
||||
isa_ok($book, 'WebGUI::Shop::AddressBook', 'create returns the right kind of object');
|
||||
|
||||
|
|
@ -124,9 +130,9 @@ is($session->getId, $book->session->getId, 'session method returns OUR session o
|
|||
|
||||
ok($session->id->valid($book->getId), 'create makes a valid GUID style addressBookId');
|
||||
|
||||
is($book->get('userId'), 3, 'create uses $session->user to get the userid for this book');
|
||||
is($book->get('userId'), $tempAdmin->getId, 'create uses $session->user to get the userid for this book');
|
||||
|
||||
my $bookCount = $session->db->quickScalar('select count(*) from addressBook');
|
||||
my $bookCount = $session->db->quickScalar('select count(*) from addressBook where addressBookId=?',[$book->getId]);
|
||||
is($bookCount, 1, 'only 1 address book was created');
|
||||
|
||||
my $alreadyHaveBook = WebGUI::Shop::AddressBook->create($session);
|
||||
|
|
@ -191,25 +197,188 @@ cmp_deeply(
|
|||
'update updates the db, too'
|
||||
);
|
||||
|
||||
#######################################################################
|
||||
#
|
||||
# getProfileAddress
|
||||
#
|
||||
#######################################################################
|
||||
|
||||
eval { $book->getProfileAddress };
|
||||
|
||||
$e = Exception::Class->caught();
|
||||
isa_ok($e, 'WebGUI::Error::ObjectNotFound', 'getProfileAddress takes exception to a profile address not being set');
|
||||
cmp_deeply(
|
||||
$e,
|
||||
methods(
|
||||
error => 'No profile address.',
|
||||
),
|
||||
'... correct error message',
|
||||
);
|
||||
|
||||
$address1->update({ isProfile => 1 });
|
||||
|
||||
my $profile_address = eval{ $book->getProfileAddress() };
|
||||
|
||||
is($profile_address->getId,$address1->getId,"getProfileAddress returns addresses tied to profiles");
|
||||
|
||||
#######################################################################
|
||||
#
|
||||
# www_editAddressSave
|
||||
#
|
||||
#######################################################################
|
||||
|
||||
#Clear the book address cache
|
||||
$book->uncache;
|
||||
|
||||
my $address_info = {
|
||||
label => 'Profile Label',
|
||||
addressId => $address1->getId,
|
||||
firstName => 'Andy',
|
||||
lastName => 'Dufresne',
|
||||
address1 => '123 Shank Ave',
|
||||
address2 => 'Cell Block E',
|
||||
address3 => 'Cell 12',
|
||||
city => 'Shawshank',
|
||||
state => 'PA',
|
||||
code => '11223',
|
||||
country => 'US',
|
||||
phoneNumber => '111-111-1111',
|
||||
email => 'andy@shawshank.com',
|
||||
organization => 'Shawshank'
|
||||
};
|
||||
|
||||
$session->request->setup_body({
|
||||
%$address_info,
|
||||
callback => q|{'url':''}|
|
||||
});
|
||||
|
||||
$book->www_editAddressSave;
|
||||
|
||||
$address1 = $book->getAddress($address1->getId);
|
||||
|
||||
cmp_bag(
|
||||
[ map { $address1->get($_) } keys %$address_info ],
|
||||
[ values %$address_info ],
|
||||
'Address fields were saved'
|
||||
);
|
||||
|
||||
my $u = WebGUI::User->new($session,$book->get("userId"));
|
||||
|
||||
cmp_bag(
|
||||
[ map { $u->profileField($_) } keys %{ $book->getProfileAddressMappings } ],
|
||||
[ map { $address1->get($_) } values %{ $book->getProfileAddressMappings } ],
|
||||
'Profile address was updated and matches address fields'
|
||||
);
|
||||
|
||||
#Test that updates to non profile address does not update the profile
|
||||
$book->uncache;
|
||||
|
||||
$address_info = {
|
||||
label => 'Non Profile Label',
|
||||
addressId => $address2->getId,
|
||||
firstName => 'Ellis',
|
||||
lastName => 'Redding',
|
||||
address1 => '123 Shank Ave',
|
||||
address2 => 'Cell Block E',
|
||||
address3 => 'Cell 15',
|
||||
city => 'Shawshank',
|
||||
state => 'PA',
|
||||
code => '11223',
|
||||
country => 'US',
|
||||
phoneNumber => '111-111-1111',
|
||||
email => 'red@shawshank.com',
|
||||
organization => 'Shawshank'
|
||||
};
|
||||
|
||||
|
||||
$session->request->setup_body({
|
||||
%$address_info,
|
||||
callback => q|{'url':''}|
|
||||
});
|
||||
|
||||
$book->www_editAddressSave;
|
||||
|
||||
$address1 = $book->getAddress($address1->getId);
|
||||
$address2 = $book->getAddress($address2->getId);
|
||||
|
||||
cmp_bag(
|
||||
[ map { $address2->get($_) } keys %$address_info ],
|
||||
[ values %$address_info ],
|
||||
'Non Profile Address fields were saved'
|
||||
);
|
||||
|
||||
cmp_bag(
|
||||
[ map { $u->profileField($_) } keys %{ $book->getProfileAddressMappings } ],
|
||||
[ map { $address1->get($_) } values %{ $book->getProfileAddressMappings } ],
|
||||
'Profile address was not updated when non profile fields were saved'
|
||||
);
|
||||
|
||||
#######################################################################
|
||||
#
|
||||
# www_deleteAddress
|
||||
#
|
||||
#######################################################################
|
||||
|
||||
#clear the cache
|
||||
$book->uncache;
|
||||
|
||||
$session->request->setup_body({
|
||||
'addressId' => $address2->getId,
|
||||
'callback' => q|{'url':''}|
|
||||
});
|
||||
$book->www_deleteAddress;
|
||||
|
||||
@addresses = @{ $book->getAddresses() };
|
||||
|
||||
cmp_bag(
|
||||
[ map { $_->getId } @addresses ],
|
||||
[$address1->getId],
|
||||
'Address was deleted properly'
|
||||
);
|
||||
|
||||
|
||||
#clear the cache
|
||||
$book->uncache;
|
||||
|
||||
$session->request->setup_body({
|
||||
'addressId' => $address1->getId,
|
||||
'callback' => q|{'url':''}|
|
||||
});
|
||||
$book->www_deleteAddress;
|
||||
|
||||
@addresses = @{ $book->getAddresses() };
|
||||
|
||||
cmp_bag(
|
||||
[ map { $_->getId } @addresses ],
|
||||
[$address1->getId],
|
||||
'Profile Address was not deleted'
|
||||
);
|
||||
|
||||
|
||||
#######################################################################
|
||||
#
|
||||
# delete
|
||||
#
|
||||
#######################################################################
|
||||
|
||||
#clear the cache
|
||||
$book->uncache;
|
||||
|
||||
my $addressBookId = $alreadyHaveBook->getId;
|
||||
my $firstCount = $session->db->quickScalar('select count(*) from addressBook where addressBookId=?',[$addressBookId]);
|
||||
$alreadyHaveBook->delete();
|
||||
$bookCount = $session->db->quickScalar('select count(*) from addressBook');
|
||||
my $addrCount = $session->db->quickScalar('select count(*) from address');
|
||||
my $afterCount = $session->db->quickScalar('select count(*) from addressBook where addressBookId=?',[$addressBookId]);
|
||||
my $addrCount = $session->db->quickScalar('select count(*) from address where addressBookId=?',[$addressBookId]);
|
||||
|
||||
is($bookCount, 1, 'delete: one book deleted');
|
||||
ok(($firstCount == 1 && $afterCount == 0), 'delete: one book deleted');
|
||||
|
||||
$addressBookId = $bookClone->getId;
|
||||
$bookClone->delete();
|
||||
$bookCount = $session->db->quickScalar('select count(*) from addressBook');
|
||||
my $addrCount = $session->db->quickScalar('select count(*) from address');
|
||||
$bookCount = $session->db->quickScalar('select count(*) from addressBook where addressBookId=?',[$addressBookId]);
|
||||
my $addrCount = $session->db->quickScalar('select count(*) from address where addressBookId=?',[$addressBookId]);
|
||||
|
||||
is($bookCount, 0, '... book deleted');
|
||||
is($addrCount, 0, '... also deletes addresses in the book');
|
||||
undef $book;
|
||||
|
||||
#######################################################################
|
||||
#
|
||||
|
|
@ -217,7 +386,6 @@ undef $book;
|
|||
#
|
||||
#######################################################################
|
||||
|
||||
|
||||
my $otherSession = WebGUI::Test->newSession;
|
||||
my $mergeUser = WebGUI::User->create($otherSession);
|
||||
WebGUI::Test->addToCleanup($mergeUser);
|
||||
|
|
@ -235,3 +403,225 @@ cmp_bag(
|
|||
[ $goodAddress->getId, ],
|
||||
'newByUserId works'
|
||||
);
|
||||
|
||||
#######################################################################
|
||||
#
|
||||
# www_ajaxSearch
|
||||
#
|
||||
#######################################################################
|
||||
|
||||
#Create some data to search for
|
||||
my $andySession = WebGUI::Test->newSession;
|
||||
my $andy = WebGUI::User->create($andySession);
|
||||
WebGUI::Test->addToCleanup($andy);
|
||||
$andySession->user({ userId => $andy->getId });
|
||||
my $andyBook = WebGUI::Shop::AddressBook->create($andySession);
|
||||
WebGUI::Test->addToCleanup($andyBook);
|
||||
|
||||
my $andyAddr1 = $andyBook->addAddress({
|
||||
label => 'Andy1',
|
||||
firstName => 'Andy',
|
||||
lastName => 'Dufresne',
|
||||
address1 => '123 Shank Ave',
|
||||
address2 => 'Cell Block E',
|
||||
address3 => 'Cell 12',
|
||||
city => 'Shawshank',
|
||||
state => 'PA',
|
||||
code => '11223',
|
||||
country => 'US',
|
||||
phoneNumber => '111-111-1111',
|
||||
email => 'andy@shawshank.com',
|
||||
organization => 'Shawshank'
|
||||
});
|
||||
|
||||
my $andyAddr2 = $andyBook->addAddress({
|
||||
label => 'Andy2',
|
||||
firstName => 'Andy',
|
||||
lastName => 'Dufresne',
|
||||
address1 => '123 Seaside Ave',
|
||||
address2 => '',
|
||||
address3 => '',
|
||||
city => 'Zihuatanejo',
|
||||
state => '',
|
||||
code => '40880',
|
||||
country => 'MX',
|
||||
phoneNumber => '222-222-2222',
|
||||
email => 'andy@freeman.com',
|
||||
organization => 'Unaffiliated'
|
||||
});
|
||||
|
||||
|
||||
my $redSession = WebGUI::Test->newSession;
|
||||
my $red = WebGUI::User->create($redSession);
|
||||
WebGUI::Test->addToCleanup($red);
|
||||
$redSession->user({userId => $red->getId});
|
||||
my $redBook = WebGUI::Shop::AddressBook->create($redSession);
|
||||
WebGUI::Test->addToCleanup($redBook);
|
||||
|
||||
my $redAddr = $redBook->addAddress({
|
||||
label => 'Red1',
|
||||
firstName => 'Ellis',
|
||||
lastName => 'Redding',
|
||||
address1 => '123 Shank Ave',
|
||||
address2 => 'Cell Block E',
|
||||
address3 => 'Cell 15',
|
||||
city => 'Shawshank',
|
||||
state => 'PA',
|
||||
code => '11223',
|
||||
country => 'US',
|
||||
phoneNumber => '111-111-1111',
|
||||
email => 'red@shawshank.com',
|
||||
organization => 'Shawshank'
|
||||
});
|
||||
|
||||
|
||||
my $brooksSession = WebGUI::Test->newSession;
|
||||
my $brooks = WebGUI::User->create($brooksSession);
|
||||
WebGUI::Test->addToCleanup($brooks);
|
||||
$brooksSession->user({userId => $brooks->getId});
|
||||
my $brooksBook = WebGUI::Shop::AddressBook->create($brooksSession);
|
||||
WebGUI::Test->addToCleanup($brooksBook);
|
||||
|
||||
my $brooksAddr = $brooksBook->addAddress({
|
||||
label => 'Brooks1',
|
||||
firstName => 'Brooks',
|
||||
lastName => 'Hatlen',
|
||||
address1 => '123 Shank Ave',
|
||||
address2 => 'Cell Block E',
|
||||
address3 => 'Cell 22',
|
||||
city => 'Shawshank',
|
||||
state => 'PA',
|
||||
code => '11223',
|
||||
country => 'US',
|
||||
phoneNumber => '111-111-1111',
|
||||
email => 'brooks@shawshank.com',
|
||||
organization => 'Shawshank'
|
||||
});
|
||||
|
||||
#Test search as admin
|
||||
$session->request->setup_body({
|
||||
'name' => 'Andy Du'
|
||||
});
|
||||
|
||||
my $results = JSON->new->decode($book->www_ajaxSearch);
|
||||
|
||||
cmp_bag(
|
||||
$results,
|
||||
[
|
||||
{ %{$andyAddr1->get}, username => $andy->username },
|
||||
{ %{$andyAddr2->get}, username => $andy->username },
|
||||
],
|
||||
'Ajax Address Search matches name correctly for admins'
|
||||
);
|
||||
|
||||
#Test search for multiple fields
|
||||
$session->request->setup_body({
|
||||
'name' => 'Andy Du',
|
||||
'organization' => 'Shaw',
|
||||
'address1' => '123',
|
||||
'address2' => 'Cell',
|
||||
'address3' => 'Cell',
|
||||
'city' => 'Shaw',
|
||||
'state' => 'P',
|
||||
'zipcode' => '11',
|
||||
'country' => 'U',
|
||||
'email' => 'andy',
|
||||
'phone' => '111',
|
||||
});
|
||||
|
||||
$results = JSON->new->decode($book->www_ajaxSearch);
|
||||
|
||||
cmp_bag(
|
||||
$results,
|
||||
[{ %{$andyAddr1->get}, username => $andy->username }],
|
||||
'Ajax Address Search matches multiple fields correctly'
|
||||
);
|
||||
|
||||
#Test limiting
|
||||
$session->request->setup_body({
|
||||
'name' => 'Andy Du',
|
||||
'organization' => 'Shaw',
|
||||
'address1' => '123',
|
||||
'address2' => 'Cell',
|
||||
'address3' => 'Cell',
|
||||
'city' => 'Shaw',
|
||||
'state' => 'Q', #This should cause no results to come back
|
||||
'zipcode' => '11',
|
||||
'country' => 'U',
|
||||
'email' => 'andy',
|
||||
'phone' => '111',
|
||||
});
|
||||
|
||||
$results = JSON->new->decode($book->www_ajaxSearch);
|
||||
|
||||
cmp_bag(
|
||||
$results,
|
||||
[],
|
||||
'Ajax Address Search limits results correctly'
|
||||
);
|
||||
|
||||
#Test searching across users
|
||||
#Test as admin
|
||||
$session->request->setup_body({
|
||||
'organization' => 'Shawshank'
|
||||
});
|
||||
|
||||
$results = JSON->new->decode($book->www_ajaxSearch);
|
||||
|
||||
cmp_bag(
|
||||
$results,
|
||||
[
|
||||
{ %{$andyAddr1->get}, username => $andy->username },
|
||||
{ %{$redAddr->get}, username => $red->username },
|
||||
{ %{$brooksAddr->get}, username => $brooks->username },
|
||||
],
|
||||
'Ajax Address Search returns cross user results for admins'
|
||||
);
|
||||
|
||||
#Test as shop admin
|
||||
$andy->addToGroups([ $andySession->setting->get('groupIdAdminCommerce') ]);
|
||||
$andySession->request->setup_body({
|
||||
'organization' => 'Shawshank'
|
||||
});
|
||||
$results = JSON->new->decode($andyBook->www_ajaxSearch);
|
||||
|
||||
cmp_bag(
|
||||
$results,
|
||||
[
|
||||
{ %{$andyAddr1->get}, username => $andy->username },
|
||||
{ %{$redAddr->get}, username => $red->username },
|
||||
{ %{$brooksAddr->get}, username => $brooks->username },
|
||||
],
|
||||
'Ajax Address Search returns cross user results for shop admins'
|
||||
);
|
||||
|
||||
#Test search as shop cashier
|
||||
$red->addToGroups([ $redSession->setting->get('groupIdCashier') ]);
|
||||
$redSession->request->setup_body({
|
||||
'organization' => 'Shawshank'
|
||||
});
|
||||
$results = JSON->new->decode($redBook->www_ajaxSearch);
|
||||
|
||||
cmp_bag(
|
||||
$results,
|
||||
[
|
||||
{ %{$andyAddr1->get}, username => $andy->username },
|
||||
{ %{$redAddr->get}, username => $red->username },
|
||||
{ %{$brooksAddr->get}, username => $brooks->username },
|
||||
],
|
||||
'Ajax Address Search returns cross user results for shop cashiers'
|
||||
);
|
||||
|
||||
#Test search as non privileged
|
||||
$brooksSession->request->setup_body({
|
||||
'organization' => 'Shawshank'
|
||||
});
|
||||
$results = JSON->new->decode($brooksBook->www_ajaxSearch);
|
||||
|
||||
cmp_bag(
|
||||
$results,
|
||||
[{ %{$brooksAddr->get}, username => $brooks->username }],
|
||||
'Ajax Address Search returns only current user results for non privileged users'
|
||||
);
|
||||
|
||||
undef $book;
|
||||
|
|
|
|||
|
|
@ -144,6 +144,7 @@ my $defaultPayDrivers = {
|
|||
'WebGUI::Shop::PayDriver::Ogone' => 'Ogone',
|
||||
'WebGUI::Shop::PayDriver::PayPal::PayPalStd' => 'PayPal',
|
||||
'WebGUI::Shop::PayDriver::PayPal::ExpressCheckout' => 'PayPal Express Checkout',
|
||||
'WebGUI::Shop::PayDriver::CreditCard::AuthorizeNet' => 'Credit Card (Authorize.net)',
|
||||
};
|
||||
|
||||
cmp_deeply( $drivers, $defaultPayDrivers, 'getDrivers returns the default PayDrivers');
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue